summaryrefslogtreecommitdiffstats
path: root/kcontrol/background
diff options
context:
space:
mode:
Diffstat (limited to 'kcontrol/background')
-rw-r--r--kcontrol/background/CMakeLists.txt7
-rw-r--r--kcontrol/background/KCrossBGRender.cpp (renamed from kcontrol/background/KCrossBGRender.cc)2
-rw-r--r--kcontrol/background/background.desktop222
-rw-r--r--kcontrol/background/bgadvanced.cpp32
-rw-r--r--kcontrol/background/bgadvanced.h6
-rw-r--r--kcontrol/background/bgdefaults.h6
-rw-r--r--kcontrol/background/bgdialog.cpp153
-rw-r--r--kcontrol/background/bgdialog.h9
-rw-r--r--kcontrol/background/bgdialog_ui.ui8
-rw-r--r--kcontrol/background/bgmonitor.cpp7
-rw-r--r--kcontrol/background/bgmonitor.h7
-rw-r--r--kcontrol/background/bgrender.cpp25
-rw-r--r--kcontrol/background/bgrender.h9
-rw-r--r--kcontrol/background/bgsettings.cpp17
-rw-r--r--kcontrol/background/bgsettings.h9
-rw-r--r--kcontrol/background/bgwallpaper.cpp14
-rw-r--r--kcontrol/background/bgwallpaper.h4
-rw-r--r--kcontrol/background/crossfade.h3
-rw-r--r--kcontrol/background/main.cpp6
-rw-r--r--kcontrol/background/main.h4
20 files changed, 178 insertions, 372 deletions
diff --git a/kcontrol/background/CMakeLists.txt b/kcontrol/background/CMakeLists.txt
index 2dfc7ba3f..5e3670616 100644
--- a/kcontrol/background/CMakeLists.txt
+++ b/kcontrol/background/CMakeLists.txt
@@ -29,7 +29,7 @@ if( BUILD_KCONTROL OR BUILD_KDESKTOP OR BUILD_TDM )
##### bgnd (static) #############################
tde_add_library( bgnd STATIC_PIC AUTOMOC
- SOURCES bgrender.cpp bgsettings.cpp KCrossBGRender.cc
+ SOURCES bgrender.cpp bgsettings.cpp KCrossBGRender.cpp
LINK ${LIBART_LIBRARIES}
)
@@ -42,7 +42,10 @@ if( BUILD_KCONTROL )
##### other data ################################
- install( FILES background.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
+ tde_create_translated_desktop(
+ SOURCE background.desktop
+ PO_DIR kcontrol-desktops
+ )
##### kcm_background (module) ###################
diff --git a/kcontrol/background/KCrossBGRender.cc b/kcontrol/background/KCrossBGRender.cpp
index 489e98d1b..8f91a904d 100644
--- a/kcontrol/background/KCrossBGRender.cc
+++ b/kcontrol/background/KCrossBGRender.cpp
@@ -149,7 +149,7 @@ bool KCrossBGRender::needWallpaperChange(){
}
/*
- * This method change the enabledEffect flag to TRUE of FALSE, according
+ * This method change the enabledEffect flag to true of false, according
* with multiWallpaperMode and FileName (it needs to be a XML)
*/
void KCrossBGRender::fixEnabled(){
diff --git a/kcontrol/background/background.desktop b/kcontrol/background/background.desktop
index dd073b598..985d5b044 100644
--- a/kcontrol/background/background.desktop
+++ b/kcontrol/background/background.desktop
@@ -10,231 +10,9 @@ X-TDE-FactoryName=background
X-TDE-ParentApp=kcontrol
Name=Background
-Name[af]=Agtergrond
-Name[ar]=الخلفية
-Name[az]=Arxa plan
-Name[be]=Фон
-Name[bg]=Фон на екрана
-Name[bn]=পটভূমি
-Name[br]=Drekleur
-Name[bs]=Pozadina
-Name[ca]=Fons
-Name[cs]=Pozadí
-Name[csb]=Spòdlé
-Name[cy]=Cefndir
-Name[da]=Baggrund
-Name[de]=Hintergrund
-Name[el]=Φόντο
-Name[eo]=Fono
-Name[es]=Fondo
-Name[et]=Taust
-Name[eu]=Atzeko planoa
-Name[fa]=زمینه
-Name[fi]=Tausta
-Name[fr]=Fond d'écran
-Name[fy]=Eftergrûn
-Name[ga]=Cúlra
-Name[gl]=Fondo
-Name[he]=רקע
-Name[hi]=पृष्ठभूमि
-Name[hr]=Pozadina
-Name[hu]=Háttér
-Name[id]=Latarbelakang
-Name[is]=Bakgrunnur
-Name[it]=Sfondo
-Name[ja]=背景
-Name[ka]=ფონი
-Name[kk]=Аясы
-Name[km]=ផ្ទៃ​ខាង​ក្រោយ
-Name[lo]=ພື້ນຫລັງ
-Name[lt]=Fonas
-Name[lv]=Fons
-Name[mk]=Подлога
-Name[mn]=Дэвсгэр
-Name[ms]=Latar Belakang
-Name[nb]=Bakgrunn
-Name[nds]=Achtergrund
-Name[ne]=पृष्ठभूमि
-Name[nl]=Achtergrond
-Name[nn]=Bakgrunn
-Name[nso]=Bokamorago
-Name[oc]=Fons
-Name[pa]=ਪਿੱਠਭੂਮੀ
-Name[pl]=Tło
-Name[pt]=Fundo do Ecrã
-Name[pt_BR]=Fundo de tela
-Name[ro]=Fundal
-Name[ru]=Фон
-Name[rw]=Mburabuzi
-Name[se]=Duogáš
-Name[sk]=Pozadie
-Name[sl]=Ozadje
-Name[sr]=Позадина
-Name[sr@Latn]=Pozadina
-Name[ss]=Lingemuva
-Name[sv]=Bakgrund
-Name[ta]=பின்னணி
-Name[tg]=Пасзамина
-Name[th]=พื้นหลัง
-Name[tr]=Arkaplan
-Name[tt]=Asyaq
-Name[uk]=Тло
-Name[uz]=Orqa fon
-Name[uz@cyrillic]=Орқа фон
-Name[ven]=Zwangamurahu
-Name[vi]=Ảnh nền
-Name[wa]=Fond
-Name[xh]=Indawo yangasemva
-Name[zh_CN]=背景
-Name[zh_TW]=背景
-Name[zu]=Inkundla yangemuva
Comment=Change the background settings
-Comment[af]=Verander die agtergrond instellings
-Comment[ar]=تغيير تعيينات الخلفية
-Comment[az]=Arxa plan qurğularını dəyişdirin
-Comment[be]=Змяняе настаўленні фону
-Comment[bg]=Настройване фона на работния плот
-Comment[bn]=পটভূমি সেটিংস পরিবর্তন করুন
-Comment[br]=Kemmañ kefluniadur an drekleur
-Comment[bs]=Promijenite postavke pozadine
-Comment[ca]=Canvia l'arranjament de la configuració del fons
-Comment[cs]=Změna nastavení pozadí
-Comment[csb]=Ùstôw spódkù
-Comment[cy]=Newid gosodiadau'r cefndir
-Comment[da]=Ændr baggrundsindstillinger
-Comment[de]=Einstellungen für den Hintergrund vornehmen
-Comment[el]=Αλλάξτε τις ρυθμίσεις του φόντου
-Comment[eo]=Ŝanĝu la agordon de la fono
-Comment[es]=Modificación de las preferencias del fondo
-Comment[et]=Töölaua tausta seaded
-Comment[eu]=Aldatu atzeko planoaren ezarpenak
-Comment[fa]=تغییر تنظیمات زمینه
-Comment[fi]=Muuta taustan asetuksia
-Comment[fr]=Configuration du fond d'écran
-Comment[fy]=Eftergrûnynstellings wizigje
-Comment[ga]=Athraigh socruithe an chúlra
-Comment[gl]=Cambiar as opcións do fondo
-Comment[he]=שינוי הגדרות הרקע
-Comment[hi]=पृष्ठभूमि सेटिंग बदलें
-Comment[hr]=Promjena postavki pozadine
-Comment[hu]=A háttérbeállítások megváltoztatása
-Comment[id]=Ubah pengaturan latar belakang
-Comment[is]=Stillingar bakgrunns
-Comment[it]=Cambia le impostazioni dello sfondo
-Comment[ja]=背景の設定を変更
-Comment[ka]=ფონის კონფიგურაციის შეცვლა
-Comment[kk]=Үстел аясын түрлендіру
-Comment[km]=ផ្លាស់ប្តូរការ​កំណត់​ផ្ទៃ​ខាង​ក្រោយ
-Comment[lo]=ຕັ້ງຄ່າພື້ນຫລັງ
-Comment[lt]=Keisti fono parinktis
-Comment[lv]=Mainīt fona parametrus
-Comment[mk]=Изменете ги поставувањата на подлогата
-Comment[mn]=Дэвсгэр өөрчилөх
-Comment[ms]=Ubah seting latar belakang
-Comment[mt]=Ibdel il-konfigurazzjoni tal-isfond
-Comment[nb]=Endre bakgrunnsinnstillingene
-Comment[nds]=Achtergrundinstellen ännern
-Comment[ne]=पृष्ठभूमि सेटिङ परिवर्तन गर्नुहोस्
-Comment[nl]=Achtergrondinstellingen wijzigen
-Comment[nn]=Endra bakgrunnsinnstillingane
-Comment[nso]=Fetosa dipeakanyo tsa bokamorago
-Comment[pa]=ਪਿੱਠਭੂਮੀ ਸੈਟਿੰਗ ਤਬਦੀਲ
-Comment[pl]=Ustawienia tła
-Comment[pt]=Alterar a configuração do fundo
-Comment[pt_BR]=Muda as configurações do fundo da tela
-Comment[ro]=Configurează setările fundalului
-Comment[ru]=Настройка фона рабочего стола
-Comment[rw]=Guhindura amagenamiterere ya mbuganyuma
-Comment[se]=Rievdat duogášheivehusaid
-Comment[sk]=Nastavenie pozadia
-Comment[sl]=Spremeni nastavitve ozadja
-Comment[sr]=Измена поставки позадине
-Comment[sr@Latn]=Izmena postavki pozadine
-Comment[ss]=Tjintja kuhleleka kwelingemuva
-Comment[sv]=Anpassa bakgrundsinställningar
-Comment[ta]=பின்னனி அமைப்பை மாற்று
-Comment[tg]=Таъғири танзимоти пасзамина
-Comment[th]=เปลี่ยนการตั้งค่าพื้นหลัง
-Comment[tr]=Arkaplan ayarlarını değiştirir
-Comment[tt]=Asyaq caylawın üzgärtü
-Comment[uk]=Зміна параметрів тла
-Comment[uz]=Orqa fonning moslamalarini oʻzgartirish
-Comment[uz@cyrillic]=Орқа фоннинг мосламаларини ўзгартириш
-Comment[ven]=Shandukisani mavhekanyele anga murahu
-Comment[vi]=Thay đổi thiết lập ảnh nền
-Comment[wa]=Candjî les apontiaedjes do fond del waitroûle
-Comment[xh]=Tshintsha izicwangciso zendawo yangasemva
-Comment[zh_CN]=更改背景设置
-Comment[zh_TW]=改變背景設定
-Comment[zu]=Shintsha izilungiselelo zendawo yangemuva
Keywords=background;desktops;colors;colours;images;wallpapers;blending;balance;cache;multiple wallpapers;pixmap;
-Keywords[az]=arxa plan;masa üstü;rənglər;rənglər;rəsmlər;divar kağızları;qarışdırma;denge;ön yaddaş;çoxlu divar kağızları;pixmap;
-Keywords[be]=фон;працоўныя сталы;колеры;відарысы;малюнкі;шпалеры;баланс;кэш;некалькі шпалераў;background;desktops;colors;colours;images;wallpapers;blending;balance;cache;multiple wallpapers;pixmap;
-Keywords[bg]=фон; изображение; работен; плот; работен плот; background; desktops; colors; colours; images; wallpapers; blending; balance; cache; multiple wallpapers; pixmap;
-Keywords[ca]=fons;escriptoris;colors;colors;imatges;paper pintat;barreja;balanç;cau;múltiples papers pintats;mapa de píxels;
-Keywords[cs]=Pozadí;Plochy;Barvy;Obrázky;Tapety;Směšování;Vyvážení;Cache;Pixmapa;
-Keywords[csb]=spódk;spòdlé;pùltë;biurka;farwë;òbrôzczi;tapetë;mieszanié;pòdrãcznô pamiãc;wielorazowé tapetë;bitmapa;
-Keywords[cy]=cefndir;penbwrdd;lliwiau;lliwiau;delweddau;papurau w?l;cymysgu;cydbwys;storfa;papurau w?l lluosog;picsfap;
-Keywords[da]=baggrund;desktoppe;farver;billeder;tapeter;blanding;balance;cache;flere tapeter;billede;
-Keywords[de]=Hintergrund;Arbeitsflächen;Desktop;Farben;Bilder;Hintergrundbilder;Überblendung;Pixmap;Cache;Zwischenspeicher;
-Keywords[el]=φόντο;επιφάνειες εργασίας;χρώματα;χρώματα;εικόνες;ταπετσαρίες;εξομάλυνση;ισορροπία;λανθάνουσα μνήμη;πολλαπλές ταπετσαρίες;pixmap;
-Keywords[en_GB]=background;desktops;colours;images;wallpapers;blending;balance;cache;multiple wallpapers;pixmap;
-Keywords[eo]=fono;tabuloj;koloroj;bildoj;tapetoj;kolorŝanĝo;tenejo;rastrobildo;
-Keywords[es]=fondo;escritorios;colores;imágenes;tapices;mezcla;equilibrio;caché;tapices múltiples;mapa de píxeles;pixmap;
-Keywords[et]=taust;töölaud;töölauad;värvid;pildid;taustapildid;üleminek;tasakaal;vahemälu;pikselrastrid;
-Keywords[eu]=atzeko planoa;mahaigainak;kolorea;koloreak;irudiak;hormapaperak;nahasketa; oreka;katxea;hormapaper anitz;pixel mapa;
-Keywords[fa]=زمینه، رومیزیها، رنگها، رنگها، تصاویر، کاغذهای دیواری، مخلوط، توازن، نهانگاه، کاغذ دیواریهای متعدد، نگاشت بیت;
-Keywords[fi]=tausta;työpöydät;värit;kuvat;taustakuvat;sekoitus;välimuisti;useat taustakuvat;kuvakartat;
-Keywords[fr]=fond d'écran;fond;bureau;couleur;image;papier peint;image de fond;dégradé;cache;papiers peints multiples;
-Keywords[fy]=eftergrûn;buroblêden;kleur;kleuren;ôfbyldingen;behang;ferminge; balâns;lyts ûnthâld;meardere ôfbyldingen;pixmap;grafysk;
-Keywords[ga]=cúlra;deasca;dathanna;íomhánna;cúlbhrait;cumasc;cothrom;taisce;cúlbhrait iomadúla;mapa picteilíní;
-Keywords[gl]=fondo;escritórios;cores;imaxes;papeis tapiz;balance;cache;múltiples papeis tapiz;mapa de píxels;
-Keywords[he]=רקע;תמונות;background;desktops;colors;colours;images;wallpapers;blending;balance;cache;multiple;wallpapers;pixmapפטים;עירוב;איזון;מטמון;טפטים;מרובים;צבעים;שולחנות עבודה; ;
-Keywords[hi]=पृष्ठभूमि;डेस्कटॉप;रंग;अनेक रंग;छवि;वालपेपर;ब्लेंडिंग;बैलेंस;कैश;अनेक वालपेपर;पिक्समैप;
-Keywords[hr]=background;desktops;colors;colours;images;wallpapers;blending;balance;cache;multiple wallpapers;pixmap;pozadina; radna površina;boje;boja;slike;slika radne površine;preklapanje;prozirnost;balans;pohrana;višestruke slike radne površine;
-Keywords[hu]=háttér;asztalok;színek;képek;tapéták;színkeverés;egyensúly;gyorstár;több tapéta;pixmap;
-Keywords[is]=bakgrunnur;skjáborð;litir;myndir;veggfóður;blöndun;jafnvægi;skyndiminni;mörg veggfóður;mynd;punktamynd;bitamynd;
-Keywords[it]=sfondo;desktop;colori;immagini;immagini di sfondo;sfumature;bilanciamento;cache;sfondi multipli;
-Keywords[ja]=背景;色;色付け;画像;壁紙;ブレンディング;バランス;キャッシュ;複数の壁紙;ピクスマップ;
-Keywords[km]=ផ្ទៃ​ខាង​ក្រោយ;ផ្ទៃតុ;ពណ៌;រូបភាព;ក្រដាស​បិទ​ជញ្ជាំង;ច្របល់;តុល្យភាព;ឃ្លាំង​សម្ងាត់;ក្រដាសបិទ​ជញ្ជាំង​ច្រើន;pixmap;
-Keywords[lt]=background;fonas;desktops;darbastaliai;colors;spalvos;colours;images;paveiksliukai;wallpapers;apmušalai;blending;balance;perėjimas;cache;kešas;krepšys;multiple wallpapers;pixmap;taškinė grafika;
-Keywords[lv]=fons;darbvirsmas;krāsu;krāsas;attēli;tapetes;saplūstošas;balanss;kešs;daudzas tapetes;piksmapi;
-Keywords[mk]=background;desktops;colors;colours;images;wallpapers;blending;balance;cache;multiple wallpapers;pixmap;подлога;позадина;површини;бои;слики;позадини;мешање;рамнотежа;кеш;повеќе подлоги;повеќе позадини;
-Keywords[mn]=Дэвсгэр;Ажлын талбар;Desktop;Өнгө;Зураг;Дэвсгэр зураг;Анивчилт;Тэнцвэр;түр хадгалагч;pixmap;
-Keywords[nb]=bakgrunn;skrivebord;farger;bilder;bakgrunnsbilder;flere bakgrunnsbilder;
-Keywords[nds]=Achtergrund;Schriefdischen;Klören;Biller;wallpapers;blending;balance;Twischenspieker;multiple wallpapers;pixmap;
-Keywords[ne]=पृष्ठभूमि;डेस्कटप;रङ;रङ;छवि; क्यास;छवि;बहुविध वालपेपर;सन्तुलन;ब्लेन्डिङ पिक्सम्याप;
-Keywords[nl]=achtergrond;desktops;bureaubladen;kleur;kleuren;afbeeldingen;behang;wallpapers;gradiënt;vermenging;balans;cache;meerdere afbeeldingen;pixmap;graphics;
-Keywords[nn]=bakgrunn;skrivebord;fargar;bilete;bakgrunnsbilete;overgang;balanse;fleire bakgrunnsbilete;
-Keywords[nso]=bokamorago;di-desktop;mebala;mebala;ponagalo;wallpapers;blending;lekalekanya;polokelo;wallpapers tsa bontshi;pixmap;
-Keywords[pa]=background;desktops;colors;colours;images;wallpapers;blending;balance;cache;multiple wallpapers;pixmap; ਵਾਲਪੇਪਰ; ਰੰਗ; ਚਿੱਤਰ; ਪਿੱਠਭੂਮੀ;
-Keywords[pl]=tło;pulpity;biurka;kolory;obrazki;tapety;mieszanie;równowaga;pamięć podręczna;wielokrotne tapety;mapa bitowa;
-Keywords[pt]=fundo;ecrãs;cores;imagens;papéis de parede;mistura;balanceamento;cache;múltiplos;imagem;
-Keywords[pt_BR]=fundo;áreas de trabalho;cores;imagens;papel de parede;mistura;balanço;cache;múltiplos papéis de parede;pixmap;
-Keywords[ro]=fundal;ecrane;culori;imagini;multiplu;amestecare;balans;cache;pixmap;
-Keywords[ru]=background;desktops;colors;colours;images;wallpapers;blending;balance;cache;multiple wallpapers;pixmap;фон;изображение;обои;рабочий стол;
-Keywords[rw]=Mbuganyuma;ibiro;amabara;amabara;amashusho;impapurorukuta;ivanga;iringaniza;ubwihisho;impapurorukuta zitandukanye;ikaritapigisi;
-Keywords[se]=duogáš;čállinbeavddit;ivnnit;govat;duogášgovat;seaguheapmi;balánsa;máŋgá duogášgova;
-Keywords[sk]=pozadie;plochy;farby;obrázky;tapety;blending;rovnováha;cache;viacnásobné tapety;pixmap;
-Keywords[sl]=ozadje;namizja;barve;slike;tapete;več tapet;blending;pixmap;
-Keywords[sr]=позадина;радне површине;боје;слике;позадинске слике;претапање;баланс;кеш;вишеструке позадинске слике;
-Keywords[sr@Latn]=pozadina;radne površine;boje;slike;pozadinske slike;pretapanje;balans;keš;višestruke pozadinske slike;
-Keywords[sv]=bakgrund;skrivbord;färger;bilder;skrivbordsunderlägg;blandning;balans;cache;flera skrivbordsunderlägg;pixmapp;
-Keywords[ta]=பின்னணி;மேல்மேசை;வண்ணங்கள்;வண்ணங்கள்;சித்திரங்கள்;பின்னணி சித்திரங்கள்;கலத்தல்;மீதி;தற்காலிக;பலவகையான பின்னணி சித்திரங்கள்;பிக்ஸ்மாப்;
-Keywords[tg]=background;desktops;colors;colours;images;wallpapers;blending;balance;cache;multiple wallpapers;pixmap; пасзамина;
-Keywords[th]=พื้นหลัง;พื้นที่ทำงาน;สี;ชุดสี;ภาพ;ภาพพื้นหลัง;สมดุล;แคช;พื้นหลังหลายภาพ;บิตแมพ;
-Keywords[tr]=artalan;masaüstü;renkler;renkler;resimler;duvar kağıtları;karıştırma;denge;ön bellek;çoklu duvar kağıtları;pixmap;
-Keywords[uk]=тло;стільниці;кольори;зображення;шпалери;перехід;баланс;кеш;декілька шпалери;pixmap;стільниці;
-Keywords[uz]=orqa fon;ish stollari;ranglar;rasmlar;wallpapers;blending;balance;kesh;multiple wallpapers;pixmap;
-Keywords[uz@cyrillic]=орқа фон;иш столлари;ранглар;расмлар;wallpapers;блендинг;balance;кэш;multiple wallpapers;pixmap;
-Keywords[ven]=murahu;desikithopo;mivhala;zwifanyiso;mabammbiri a luvhondoni;tanganisa;linganisa;cache;mabammbiri a luvhondoni manzhi;tsumbamashango ya phikisi;
-Keywords[vi]=nền;màn hình nền;màu;màu sắc;ảnh;ảnh nền;trộn;cân bằng;đệm;nhiều ảnh nền;mảng ảnh;
-Keywords[wa]=fond;sicribannes;coleurs;imaedjes;fond del waitroûle;maxhî;balance;muchete;sacwantes fonds d' waitroûle;pixmap;
-Keywords[xh]=indawo yangasemva;desktops;imibala;imibala;imifanekiso;amaphepha odonga;uxubo;isikali;indawo efihlakeleyo yokufihla izixhobo;amaphepha odonga amaninzi;imaphu ye pix;
-Keywords[zh_CN]=background;desktops;colors;colours;images;wallpapers;blending;balance;cache;multiple wallpapers;pixmap;背景;桌面;颜色;图像;墙纸;混色;平衡;缓冲;多个墙纸;位图;
-Keywords[zh_TW]=background;desktops;colors;colours;images;wallpapers;blending;balance;cache;multiple wallpapers;pixmap;背景;桌面;顏色;影像;桌布;混色;平衡;緩衝;多個桌布;位圖;
-Keywords[zu]=inkundla yangemuva;ama-desktop;imibala;imibala;izithombe;amaphepha ezindonga;ukuxubanisa;ukulinganisa;cache;amaphepha ezindonga eziningi;pixmap;
Categories=Qt;TDE;X-TDE-settings-looknfeel;
diff --git a/kcontrol/background/bgadvanced.cpp b/kcontrol/background/bgadvanced.cpp
index 697836797..2d5db7b8f 100644
--- a/kcontrol/background/bgadvanced.cpp
+++ b/kcontrol/background/bgadvanced.cpp
@@ -1,4 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
+/*
This file is part of the KDE project, module kcmbackground.
@@ -37,7 +37,7 @@
#include <tdelocale.h>
#include <tdemessagebox.h>
#include <kpixmap.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <twin.h>
#include "bgrender.h"
@@ -77,8 +77,8 @@ BGAdvancedDialog::BGAdvancedDialog(KBackgroundRenderer *_r,
dlg->m_listPrograms->header()->setStretchEnabled ( true, 1 );
dlg->m_listPrograms->setAllColumnsShowFocus(true);
- connect(dlg->m_listPrograms, TQT_SIGNAL(clicked(TQListViewItem *)),
- TQT_SLOT(slotProgramItemClicked(TQListViewItem *)));
+ connect(dlg->m_listPrograms, TQ_SIGNAL(clicked(TQListViewItem *)),
+ TQ_SLOT(slotProgramItemClicked(TQListViewItem *)));
// Load programs
TQStringList lst = KBackgroundProgram::list();
@@ -100,15 +100,15 @@ BGAdvancedDialog::BGAdvancedDialog(KBackgroundRenderer *_r,
dlg->m_spinCache->setSpecialValueText(i18n("Unlimited"));
dlg->m_spinCache->setSuffix(i18n(" KB"));
- connect(dlg->m_buttonAdd, TQT_SIGNAL(clicked()),
- TQT_SLOT(slotAdd()));
- connect(dlg->m_buttonRemove, TQT_SIGNAL(clicked()),
- TQT_SLOT(slotRemove()));
- connect(dlg->m_buttonModify, TQT_SIGNAL(clicked()),
- TQT_SLOT(slotModify()));
+ connect(dlg->m_buttonAdd, TQ_SIGNAL(clicked()),
+ TQ_SLOT(slotAdd()));
+ connect(dlg->m_buttonRemove, TQ_SIGNAL(clicked()),
+ TQ_SLOT(slotRemove()));
+ connect(dlg->m_buttonModify, TQ_SIGNAL(clicked()),
+ TQ_SLOT(slotModify()));
- connect(dlg->m_listPrograms, TQT_SIGNAL(doubleClicked(TQListViewItem *)),
- TQT_SLOT(slotProgramItemDoubleClicked(TQListViewItem *)));
+ connect(dlg->m_listPrograms, TQ_SIGNAL(doubleClicked(TQListViewItem *)),
+ TQ_SLOT(slotProgramItemDoubleClicked(TQListViewItem *)));
}
else
{
@@ -119,8 +119,8 @@ BGAdvancedDialog::BGAdvancedDialog(KBackgroundRenderer *_r,
dlg->m_groupCache->hide();
}
- connect( dlg->m_cbProgram, TQT_SIGNAL(toggled(bool)),
- TQT_SLOT(slotEnableProgram(bool)));
+ connect( dlg->m_cbProgram, TQ_SIGNAL(toggled(bool)),
+ TQ_SLOT(slotEnableProgram(bool)));
m_backgroundMode = m_oldBackgroundMode = r->backgroundMode();
if (m_oldBackgroundMode == KBackgroundSettings::Program)
@@ -175,7 +175,7 @@ void BGAdvancedDialog::setTextBackgroundColor(const TQColor &color)
else
{
dlg->m_cbSolidTextBackground->setChecked(false);
- dlg->m_colorTextBackground->setColor(Qt::white);
+ dlg->m_colorTextBackground->setColor(TQt::white);
dlg->m_colorTextBackground->setEnabled(false);
}
dlg->m_colorTextBackground->blockSignals(false);
@@ -434,7 +434,7 @@ KProgramEditDialog::KProgramEditDialog(const TQString &program, TQWidget *parent
m_RefreshEdit->setSuffix(i18n(" min"));
m_RefreshEdit->setFixedSize(m_RefreshEdit->sizeHint());
lbl->setBuddy(m_RefreshEdit);
- grid->addWidget(m_RefreshEdit, 5, 1, Qt::AlignLeft);
+ grid->addWidget(m_RefreshEdit, 5, 1, TQt::AlignLeft);
m_Program = program;
if (m_Program.isEmpty()) {
diff --git a/kcontrol/background/bgadvanced.h b/kcontrol/background/bgadvanced.h
index cc1ba7bf1..71dfa61ac 100644
--- a/kcontrol/background/bgadvanced.h
+++ b/kcontrol/background/bgadvanced.h
@@ -1,4 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
+/*
This file is part of the KDE project, module kcmbackground.
@@ -38,7 +38,7 @@ class KBackgroundProgram;
class BGAdvancedDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
BGAdvancedDialog(KBackgroundRenderer *_r, TQWidget *parent, bool m_multidesktop);
@@ -95,7 +95,7 @@ private:
*/
class KProgramEditDialog: public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
KProgramEditDialog(const TQString &program=TQString::null, TQWidget *parent=0L,
diff --git a/kcontrol/background/bgdefaults.h b/kcontrol/background/bgdefaults.h
index d64c6e546..e6ece1cfe 100644
--- a/kcontrol/background/bgdefaults.h
+++ b/kcontrol/background/bgdefaults.h
@@ -1,4 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
+/*
*
* This file is part of the KDE project, module kdesktop.
* Copyright (C) 1999 Geert Jansen <g.t.jansen@stud.tue.nl>
@@ -24,12 +24,10 @@
#define _defMinOptimizationDepth 1
// Per desktop defaults
-// Before you change this get in touch with me (kb9vqf@pearsoncomputing.net)
-// Thanks!!
#define _defColorA TQColor("#003082")
#define _defColorB TQColor("#C0C0C0")
#define _defBackgroundMode KBackgroundSettings::Flat
-#define _defWallpaperMode KBackgroundSettings::Scaled
+#define _defWallpaperMode KBackgroundSettings::ScaleAndCrop
#define _defMultiMode KBackgroundSettings::NoMulti
#define _defBlendMode KBackgroundSettings::NoBlending
#define _defBlendBalance 100
diff --git a/kcontrol/background/bgdialog.cpp b/kcontrol/background/bgdialog.cpp
index e903b7bc2..79686182e 100644
--- a/kcontrol/background/bgdialog.cpp
+++ b/kcontrol/background/bgdialog.cpp
@@ -1,6 +1,4 @@
/*
- kate: space-indent on; indent-width 3; indent-mode cstyle;
-
This file is part of the KDE libraries
Copyright (c) 2005 David Saxton <david@bluehaze.org>
@@ -49,7 +47,7 @@
#include <kimageio.h>
#include <tdelocale.h>
#include <kpixmap.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kstringhandler.h>
#include <kurlrequester.h>
#include <twin.h>
@@ -75,7 +73,7 @@ BGDialog::BGDialog(TQWidget* parent, TDEConfig* _config, bool _multidesktop)
m_previewUpdates = true;
KWinModule *m_twin;
- m_twin = new KWinModule(TQT_TQOBJECT(this));
+ m_twin = new KWinModule(this);
m_curDesk = m_twin->currentDesktop();
TQSize s(m_twin->numberOfViewports(m_twin->currentDesktop()));
m_useViewports = s.width() * s.height() > 1;
@@ -124,21 +122,21 @@ BGDialog::BGDialog(TQWidget* parent, TDEConfig* _config, bool _multidesktop)
m_eScreen = 0;
}
- connect(m_buttonIdentifyScreens, TQT_SIGNAL(clicked()), TQT_SLOT(slotIdentifyScreens()));
+ connect(m_buttonIdentifyScreens, TQ_SIGNAL(clicked()), TQ_SLOT(slotIdentifyScreens()));
// preview monitor
m_pMonitorArrangement = new BGMonitorArrangement(m_screenArrangement, "monitor arrangement");
- connect(m_pMonitorArrangement, TQT_SIGNAL(imageDropped(const TQString &)), TQT_SLOT(slotImageDropped(const TQString &)));
+ connect(m_pMonitorArrangement, TQ_SIGNAL(imageDropped(const TQString &)), TQ_SLOT(slotImageDropped(const TQString &)));
if( m_multidesktop)
{
// desktop
- connect(m_comboDesktop, TQT_SIGNAL(activated(int)),
- TQT_SLOT(slotSelectDesk(int)));
+ connect(m_comboDesktop, TQ_SIGNAL(activated(int)),
+ TQ_SLOT(slotSelectDesk(int)));
}
if (m_numScreens > 1)
{
- connect(m_comboScreen, TQT_SIGNAL(activated(int)),
- TQT_SLOT(slotSelectScreen(int)));
+ connect(m_comboScreen, TQ_SIGNAL(activated(int)),
+ TQ_SLOT(slotSelectScreen(int)));
}
// background image settings
@@ -148,42 +146,42 @@ BGDialog::BGDialog(TQWidget* parent, TDEConfig* _config, bool _multidesktop)
m_urlWallpaperButton->setFixedSize( pixMap.width()+8, pixMap.height()+8 );
TQToolTip::add(m_urlWallpaperButton, i18n("Open file dialog"));
- connect(m_buttonGroupBackground, TQT_SIGNAL(clicked(int)),
- TQT_SLOT(slotWallpaperTypeChanged(int)));
- connect(m_urlWallpaperBox, TQT_SIGNAL(activated(int)),
- TQT_SLOT(slotWallpaper(int)));
- connect(m_urlWallpaperButton, TQT_SIGNAL(clicked()),
- TQT_SLOT(slotWallpaperSelection()));
- connect(m_comboWallpaperPos, TQT_SIGNAL(activated(int)),
- TQT_SLOT(slotWallpaperPos(int)));
- connect(m_buttonSetupWallpapers, TQT_SIGNAL(clicked()),
- TQT_SLOT(slotSetupMulti()));
+ connect(m_buttonGroupBackground, TQ_SIGNAL(clicked(int)),
+ TQ_SLOT(slotWallpaperTypeChanged(int)));
+ connect(m_urlWallpaperBox, TQ_SIGNAL(activated(int)),
+ TQ_SLOT(slotWallpaper(int)));
+ connect(m_urlWallpaperButton, TQ_SIGNAL(clicked()),
+ TQ_SLOT(slotWallpaperSelection()));
+ connect(m_comboWallpaperPos, TQ_SIGNAL(activated(int)),
+ TQ_SLOT(slotWallpaperPos(int)));
+ connect(m_buttonSetupWallpapers, TQ_SIGNAL(clicked()),
+ TQ_SLOT(slotSetupMulti()));
// set up the background colour stuff
- connect(m_colorPrimary, TQT_SIGNAL(changed(const TQColor &)),
- TQT_SLOT(slotPrimaryColor(const TQColor &)));
- connect(m_colorSecondary, TQT_SIGNAL(changed(const TQColor &)),
- TQT_SLOT(slotSecondaryColor(const TQColor &)));
- connect(m_comboPattern, TQT_SIGNAL(activated(int)),
- TQT_SLOT(slotPattern(int)));
+ connect(m_colorPrimary, TQ_SIGNAL(changed(const TQColor &)),
+ TQ_SLOT(slotPrimaryColor(const TQColor &)));
+ connect(m_colorSecondary, TQ_SIGNAL(changed(const TQColor &)),
+ TQ_SLOT(slotSecondaryColor(const TQColor &)));
+ connect(m_comboPattern, TQ_SIGNAL(activated(int)),
+ TQ_SLOT(slotPattern(int)));
// blend
- connect(m_comboBlend, TQT_SIGNAL(activated(int)), TQT_SLOT(slotBlendMode(int)));
- connect(m_sliderBlend, TQT_SIGNAL(valueChanged(int)),
- TQT_SLOT(slotBlendBalance(int)));
- connect(m_cbBlendReverse, TQT_SIGNAL(toggled(bool)),
- TQT_SLOT(slotBlendReverse(bool)));
+ connect(m_comboBlend, TQ_SIGNAL(activated(int)), TQ_SLOT(slotBlendMode(int)));
+ connect(m_sliderBlend, TQ_SIGNAL(valueChanged(int)),
+ TQ_SLOT(slotBlendBalance(int)));
+ connect(m_cbBlendReverse, TQ_SIGNAL(toggled(bool)),
+ TQ_SLOT(slotBlendReverse(bool)));
// Crossfading background
- connect(m_cbCrossFadeBg, TQT_SIGNAL(toggled(bool)),
- TQT_SLOT(slotCrossFadeBg(bool)));
+ connect(m_cbCrossFadeBg, TQ_SIGNAL(toggled(bool)),
+ TQ_SLOT(slotCrossFadeBg(bool)));
// advanced options
- connect(m_buttonAdvanced, TQT_SIGNAL(clicked()),
- TQT_SLOT(slotAdvanced()));
+ connect(m_buttonAdvanced, TQ_SIGNAL(clicked()),
+ TQ_SLOT(slotAdvanced()));
- connect(m_buttonGetNew, TQT_SIGNAL(clicked()),
- TQT_SLOT(slotGetNewStuff()));
+ connect(m_buttonGetNew, TQ_SIGNAL(clicked()),
+ TQ_SLOT(slotGetNewStuff()));
// renderers
m_renderer.resize(m_numDesks+1);
@@ -200,19 +198,19 @@ BGDialog::BGDialog(TQWidget* parent, TDEConfig* _config, bool _multidesktop)
// Setup the merged-screen renderer
KBackgroundRenderer * r = new KBackgroundRenderer(eDesk, 0, false, _config);
m_renderer[i].insert( 0, r );
- connect( r, TQT_SIGNAL(imageDone(int,int)), TQT_SLOT(slotPreviewDone(int,int)) );
+ connect( r, TQ_SIGNAL(imageDone(int,int)), TQ_SLOT(slotPreviewDone(int,int)) );
// Setup the common-screen renderer
r = new KBackgroundRenderer(eDesk, 0, true, _config);
m_renderer[i].insert( 1, r );
- connect( r, TQT_SIGNAL(imageDone(int,int)), TQT_SLOT(slotPreviewDone(int,int)) );
+ connect( r, TQ_SIGNAL(imageDone(int,int)), TQ_SLOT(slotPreviewDone(int,int)) );
// Setup the remaining renderers for each screen
for (unsigned j=0; j < m_numScreens; ++j )
{
r = new KBackgroundRenderer(eDesk, j, true, _config);
m_renderer[i].insert( j+2, r );
- connect( r, TQT_SIGNAL(imageDone(int,int)), TQT_SLOT(slotPreviewDone(int,int)) );
+ connect( r, TQ_SIGNAL(imageDone(int,int)), TQ_SLOT(slotPreviewDone(int,int)) );
}
}
}
@@ -227,14 +225,14 @@ BGDialog::BGDialog(TQWidget* parent, TDEConfig* _config, bool _multidesktop)
// set up the common desktop renderer
KBackgroundRenderer * r = new KBackgroundRenderer(0, 0, false, _config);
m_renderer[0].insert(0, r);
- connect(r, TQT_SIGNAL(imageDone(int,int)), TQT_SLOT(slotPreviewDone(int,int)));
+ connect(r, TQ_SIGNAL(imageDone(int,int)), TQ_SLOT(slotPreviewDone(int,int)));
// set up all the other desktop renderers
for (unsigned i = 0; i < m_numDesks; ++i)
{
r = new KBackgroundRenderer(i, 0, false, _config);
m_renderer[i+1].insert(0, r);
- connect(r, TQT_SIGNAL(imageDone(int,int)), TQT_SLOT(slotPreviewDone(int,int)));
+ connect(r, TQ_SIGNAL(imageDone(int,int)), TQ_SLOT(slotPreviewDone(int,int)));
}
}
@@ -246,10 +244,36 @@ BGDialog::BGDialog(TQWidget* parent, TDEConfig* _config, bool _multidesktop)
m_slideShowRandom = KBackgroundSettings::InOrder;
// Wallpaper Position
+ m_prevWallpaperPos = KBackgroundSettings::ScaleAndCrop;
+ m_prevTilePos = KBackgroundSettings::Tiled;
+
m_wallpaperPos = eRenderer()->wallpaperMode();
if (m_wallpaperPos == KBackgroundSettings::NoWallpaper)
m_wallpaperPos = KBackgroundSettings::Centred; // Default
+ const TQString path = eRenderer()->wallpaper();
+ KFileMetaInfo metaInfo(path);
+ if (metaInfo.isValid() && metaInfo.item("Dimensions").isValid())
+ {
+ // If the image is greater than 800x600 default to using the user selected mode
+ // for a normal wallpaper, otherwise default to user selection for tiles.
+ TQSize s = metaInfo.item("Dimensions").value().toSize();
+ m_isTile = (s.width() < 800 || s.height() < 600);
+ if (m_isTile)
+ {
+ m_prevTilePos = m_wallpaperPos;
+ }
+ else
+ {
+ m_prevWallpaperPos = m_wallpaperPos;
+ }
+ }
+ else if (KMimeType::findByPath(path)->is("image/svg+xml"))
+ {
+ m_prevWallpaperPos = m_wallpaperPos;
+ }
+
+ // Restrictions
if (TDEGlobal::dirs()->isRestrictedResource("wallpaper"))
{
m_urlWallpaperButton->hide();
@@ -261,7 +285,7 @@ BGDialog::BGDialog(TQWidget* parent, TDEConfig* _config, bool _multidesktop)
updateUI();
#if (TQT_VERSION-0 >= 0x030200)
- connect( tqApp->desktop(), TQT_SIGNAL( resized( int )), TQT_SLOT( desktopResized())); // RANDR support
+ connect( tqApp->desktop(), TQ_SIGNAL( resized( int )), TQ_SLOT( desktopResized())); // RANDR support
#endif
}
@@ -419,11 +443,11 @@ void BGDialog::slotIdentifyScreens()
screenLabel->setFrameStyle(TQFrame::Panel);
screenLabel->setFrameShadow(TQFrame::Plain);
- screenLabel->setAlignment(Qt::AlignCenter);
+ screenLabel->setAlignment(TQt::AlignCenter);
screenLabel->setNum(int(s + 1));
// BUGLET: we should not allow the identification to be entered again
// until the timer fires.
- TQTimer::singleShot(1500, screenLabel, TQT_SLOT(close()));
+ TQTimer::singleShot(1500, screenLabel, TQ_SLOT(close()));
TQPoint screenCenter(TQApplication::desktop()->screenGeometry(s).center());
TQRect targetGeometry(TQPoint(0,0),screenLabel->sizeHint());
@@ -475,7 +499,7 @@ void BGDialog::initUI()
loadWallpaperFilesList();
- // Wallpaper tilings: again they must match the ones from bgrender.cc
+ // Wallpaper tilings: again they must match the ones from bgrender.cpp
m_comboWallpaperPos->insertItem(i18n("Centered"));
m_comboWallpaperPos->insertItem(i18n("Tiled"));
m_comboWallpaperPos->insertItem(i18n("Center Tiled"));
@@ -485,7 +509,7 @@ void BGDialog::initUI()
m_comboWallpaperPos->insertItem(i18n("Centered Auto Fit"));
m_comboWallpaperPos->insertItem(i18n("Scale & Crop"));
- // Blend modes: make sure these match with kdesktop/bgrender.cc !!
+ // Blend modes: make sure these match with kdesktop/bgrender.cpp !!
m_comboBlend->insertItem(i18n("No Blending"));
m_comboBlend->insertItem(i18n("Flat"));
m_comboBlend->insertItem(i18n("Horizontal"));
@@ -504,7 +528,7 @@ void BGDialog::loadWallpaperFilesList() {
// Wallpapers
// the following TQMap is lower cased names mapped to cased names and URLs
// this way we get case insensitive sorting
- TQMap<TQString, QPair<TQString, TQString> > papers;
+ TQMap<TQString, TQPair<TQString, TQString> > papers;
//search for .desktop files before searching for images without .desktop files
TQStringList lst = m_pDirs->findAllResources("wallpaper", "*desktop", false, true);
@@ -512,7 +536,7 @@ void BGDialog::loadWallpaperFilesList() {
TQStringList hiddenfiles;
for (TQStringList::ConstIterator it = lst.begin(); it != lst.end(); ++it)
{
- KSimpleConfig fileConfig(*it);
+ TDESimpleConfig fileConfig(*it);
fileConfig.setGroup("Wallpaper");
int slash = (*it).findRev('/') + 1;
@@ -596,7 +620,7 @@ void BGDialog::loadWallpaperFilesList() {
comboWallpaper->clear();
m_wallpaper.clear();
int i = 0;
- for (TQMap<TQString, QPair<TQString, TQString> >::Iterator it = papers.begin();
+ for (TQMap<TQString, TQPair<TQString, TQString> >::Iterator it = papers.begin();
it != papers.end();
++it)
{
@@ -941,18 +965,22 @@ void BGDialog::slotWallpaperTypeChanged(int i)
KFileMetaInfo metaInfo(path);
if (metaInfo.isValid() && metaInfo.item("Dimensions").isValid())
{
- // If the image is greater than 800x600 default to using scaled mode,
- // otherwise default to tiled.
-
+ // If the image is greater than 800x600 default to using the user selected mode
+ // for a normal wallpaper, otherwise default to user selection for tiles.
TQSize s = metaInfo.item("Dimensions").value().toSize();
- if (s.width() >= 800 && s.height() >= 600)
- m_wallpaperPos = KBackgroundSettings::Scaled;
+ m_isTile = (s.width() < 800 || s.height() < 600);
+ if (m_isTile)
+ {
+ m_wallpaperPos = m_prevTilePos;
+ }
else
- m_wallpaperPos = KBackgroundSettings::Tiled;
+ {
+ m_wallpaperPos = m_prevWallpaperPos;
+ }
}
else if (KMimeType::findByPath(path)->is("image/svg+xml"))
{
- m_wallpaperPos = KBackgroundSettings::Scaled;
+ m_wallpaperPos = m_prevWallpaperPos;
}
r->setWallpaperMode(m_wallpaperPos);
@@ -999,6 +1027,15 @@ void BGDialog::slotWallpaperPos(int mode)
if (mode == r->wallpaperMode())
return;
+ if (m_isTile)
+ {
+ m_prevTilePos = mode;
+ }
+ else
+ {
+ m_prevWallpaperPos = mode;
+ }
+
r->stop();
r->setWallpaperMode(mode);
r->start(true);
@@ -1257,7 +1294,7 @@ void BGDialog::slotGetNewStuff()
config->writeEntry( "StandardResource", "wallpaper" );
config->sync();
- KNS::DownloadDialog::open("wallpaper", i18n("Get New Wallpapers"));
+ KNS::DownloadDialog::open("Wallpapers", i18n("Get New Wallpapers"));
loadWallpaperFilesList();
}
diff --git a/kcontrol/background/bgdialog.h b/kcontrol/background/bgdialog.h
index 6b33d8999..a2e7bfea6 100644
--- a/kcontrol/background/bgdialog.h
+++ b/kcontrol/background/bgdialog.h
@@ -34,7 +34,7 @@ class TDEStandardDirs;
class BGDialog : public BGDialog_UI
{
- Q_OBJECT
+ TQ_OBJECT
public:
BGDialog(TQWidget* parent, TDEConfig* _config, bool _multidesktop = true);
~BGDialog();
@@ -99,8 +99,11 @@ protected:
TQValueVector< TQPtrVector<KBackgroundRenderer> > m_renderer; // m_renderer[desk][screen]
TQMap<TQString,int> m_wallpaper;
TQStringList m_patterns;
- int m_slideShowRandom; // Remembers last Slide Show setting
- int m_wallpaperPos; // Remembers last wallpaper pos
+ int m_slideShowRandom; // Remembers last Slide Show setting
+ int m_wallpaperPos; // Remembers last wallpaper pos
+ int m_prevWallpaperPos; // Previous normal wallpaper pos
+ int m_prevTilePos; // Previous tile wallpaper pos
+ bool m_isTile; // Whether the wallpaper is a tile (800x600 or smaller)
BGMonitorArrangement * m_pMonitorArrangement;
diff --git a/kcontrol/background/bgdialog_ui.ui b/kcontrol/background/bgdialog_ui.ui
index f35e19f78..4334cbbaf 100644
--- a/kcontrol/background/bgdialog_ui.ui
+++ b/kcontrol/background/bgdialog_ui.ui
@@ -719,15 +719,9 @@
<includes>
<include location="global" impldecl="in declaration">kcolorbutton.h</include>
<include location="global" impldecl="in declaration">kcombobox.h</include>
- <include location="global" impldecl="in implementation">kurlrequester.h</include>
<include location="global" impldecl="in implementation">kdialog.h</include>
+ <include location="global" impldecl="in implementation">kurlrequester.h</include>
</includes>
<layoutdefaults spacing="3" margin="6"/>
<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
-<includehints>
- <includehint>kcombobox.h</includehint>
- <includehint>kcolorbutton.h</includehint>
- <includehint>kcolorbutton.h</includehint>
- <includehint>kcombobox.h</includehint>
-</includehints>
</UI>
diff --git a/kcontrol/background/bgmonitor.cpp b/kcontrol/background/bgmonitor.cpp
index c05e70e5f..ac826a1ff 100644
--- a/kcontrol/background/bgmonitor.cpp
+++ b/kcontrol/background/bgmonitor.cpp
@@ -1,5 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
- kate: space-indent on; indent-width 4; indent-mode cstyle;
+/*
This file is part of the KDE project, module kcmbackground.
@@ -25,7 +24,7 @@
#include <kdebug.h>
#include <tdelocale.h>
#include <kpixmap.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kurldrag.h>
#include <tqapplication.h>
#include <tqpixmap.h>
@@ -48,7 +47,7 @@ BGMonitorArrangement::BGMonitorArrangement(TQWidget *parent, const char *name)
BGMonitorLabel * label = new BGMonitorLabel(this);
m_pBGMonitor[screen] = label;
- connect( label->monitor(), TQT_SIGNAL(imageDropped(const TQString &)), this, TQT_SIGNAL(imageDropped(const TQString &)) );
+ connect( label->monitor(), TQ_SIGNAL(imageDropped(const TQString &)), this, TQ_SIGNAL(imageDropped(const TQString &)) );
}
parent->setFixedSize(200, 186);
diff --git a/kcontrol/background/bgmonitor.h b/kcontrol/background/bgmonitor.h
index 4a86ea3d2..95608261b 100644
--- a/kcontrol/background/bgmonitor.h
+++ b/kcontrol/background/bgmonitor.h
@@ -1,5 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
- kate: space-indent on; indent-width 4; indent-mode cstyle;
+/*
This file is part of the KDE project, module kcmbackground.
@@ -39,7 +38,7 @@ class KPixmap;
*/
class BGMonitorArrangement : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
BGMonitorArrangement(TQWidget *parent, const char *name=0L);
@@ -95,7 +94,7 @@ protected:
*/
class BGMonitor : public TQLabel
{
- Q_OBJECT
+ TQ_OBJECT
public:
BGMonitor(TQWidget *parent, const char *name=0L);
diff --git a/kcontrol/background/bgrender.cpp b/kcontrol/background/bgrender.cpp
index d8cc53c9a..522065711 100644
--- a/kcontrol/background/bgrender.cpp
+++ b/kcontrol/background/bgrender.cpp
@@ -1,5 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
- * kate: space-indent on; tab-width 8; indent-width 4; indent-mode cstyle;
+/*
*
* This file is part of the KDE project, module kdesktop.
* Copyright (C) 1999 Geert Jansen <g.t.jansen@stud.tue.nl>
@@ -25,9 +24,9 @@
#include <dcopclient.h>
#include <tdeapplication.h>
#include <kdebug.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kimageeffect.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
#include <kpixmapio.h>
#include <tdetempfile.h>
#include <kcursor.h>
@@ -64,7 +63,7 @@ KBackgroundRenderer::KBackgroundRenderer(int desk, int screen, bool drawBackgrou
m_TilingEnabled = false;
m_pTimer = new TQTimer(this);
- connect(m_pTimer, TQT_SIGNAL(timeout()), TQT_SLOT(render()));
+ connect(m_pTimer, TQ_SIGNAL(timeout()), TQ_SLOT(render()));
}
@@ -240,8 +239,8 @@ int KBackgroundRenderer::doBackground(bool quit)
delete m_pProc;
m_pProc = new KShellProcess;
*m_pProc << file;
- connect(m_pProc, TQT_SIGNAL(processExited(TDEProcess *)),
- TQT_SLOT(slotBackgroundDone(TDEProcess *)));
+ connect(m_pProc, TQ_SIGNAL(processExited(TDEProcess *)),
+ TQ_SLOT(slotBackgroundDone(TDEProcess *)));
m_pProc->start(KShellProcess::NotifyOnExit);
retval = Wait;
break;
@@ -385,7 +384,7 @@ wp_load:
wpmode = NoWallpaper;
goto wp_out;
}
- m_Wallpaper = m_Wallpaper.convertDepth(32, Qt::DiffuseAlphaDither);
+ m_Wallpaper = m_Wallpaper.convertDepth(32, TQt::DiffuseAlphaDither);
// If we're previewing, scale the wallpaper down to make the preview
// look more like the real desktop.
@@ -403,7 +402,7 @@ wp_load:
// HACK: Use KFileMetaInfo only when we're attached to DCOP.
// KFileMetaInfo needs tdesycoca and so on, but this code is
// used also in krootimage (which in turn is used by tdm).
- if( kapp->dcopClient()->isAttached()) {
+ if( tdeApp->dcopClient()->isAttached()) {
KFileMetaInfo metaInfo(file);
if (metaInfo.isValid() && metaInfo.item("Orientation").isValid()) {
switch (metaInfo.item("Orientation").string().toInt()) {
@@ -629,7 +628,7 @@ void KBackgroundRenderer::fullWallpaperBlend()
m_Image = m_Background.copy();
if (m_Image.depth() < 32)
- m_Image = m_Image.convertDepth(32, Qt::DiffuseAlphaDither);
+ m_Image = m_Image.convertDepth(32, TQt::DiffuseAlphaDither);
} else {
m_Image.create(w, h, 32);
@@ -1161,7 +1160,7 @@ void KVirtualBGRenderer::desktopResized()
{
delete m_pPixmap;
m_pPixmap = new TQPixmap(m_size);
- m_pPixmap->fill(Qt::black);
+ m_pPixmap->fill(TQt::black);
}
initRenderers();
@@ -1229,7 +1228,7 @@ void KVirtualBGRenderer::initRenderers()
KCrossBGRender *r = new KCrossBGRender(m_desk, eScreen, m_bDrawBackgroundPerScreen, m_pConfig);
m_renderer.insert( i, r );
r->setSize(renderSize(i));
- connect( r, TQT_SIGNAL(imageDone(int,int)), this, TQT_SLOT(screenDone(int,int)) );
+ connect( r, TQ_SIGNAL(imageDone(int,int)), this, TQ_SLOT(screenDone(int,int)) );
}
}
@@ -1318,7 +1317,7 @@ void KVirtualBGRenderer::start()
// If are screen sizes do not properly tile the overall virtual screen
// size, then we want the untiled parts to be black for use in desktop
// previews, etc
- m_pPixmap->fill(Qt::black);
+ m_pPixmap->fill(TQt::black);
}
m_bFinished.fill(false);
diff --git a/kcontrol/background/bgrender.h b/kcontrol/background/bgrender.h
index 5ab1cc6c3..f9042dd56 100644
--- a/kcontrol/background/bgrender.h
+++ b/kcontrol/background/bgrender.h
@@ -1,5 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
- * kate: space-indent on; tab-width 8; indent-width 4; indent-mode cstyle;
+/*
*
* This file is part of the KDE project, module kdesktop.
* Copyright (C) 1999 Geert Jansen <g.t.jansen@stud.tue.nl>
@@ -40,7 +39,7 @@ class KBackgroundRenderer:
public TQObject,
public KBackgroundSettings
{
- Q_OBJECT
+ TQ_OBJECT
public:
KBackgroundRenderer(int desk, int screen, bool drawBackgroundPerScreen, TDEConfig *config=0);
@@ -121,9 +120,9 @@ private:
* images. Usage is similar to KBackgroundRenderer: connect to the imageDone
* signal.
*/
-class KVirtualBGRenderer : public QObject
+class KVirtualBGRenderer : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
KVirtualBGRenderer(int desk, TDEConfig *config=0l);
~KVirtualBGRenderer();
diff --git a/kcontrol/background/bgsettings.cpp b/kcontrol/background/bgsettings.cpp
index 1ee452ac2..2f41cb4c0 100644
--- a/kcontrol/background/bgsettings.cpp
+++ b/kcontrol/background/bgsettings.cpp
@@ -1,5 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
- * kate: space-indent on; indent-width 4; indent-mode cstyle;
+/*
*
* This file is part of the KDE project, module kdesktop.
* Copyright (C) 1999 Geert Jansen <g.t.jansen@stud.tue.nl>
@@ -24,8 +23,8 @@
#include <tdeapplication.h>
#include <kdebug.h>
#include <tdeglobalsettings.h>
-#include <ksimpleconfig.h>
-#include <kstandarddirs.h>
+#include <tdesimpleconfig.h>
+#include <tdestandarddirs.h>
#include <krandomsequence.h>
#include <konq_defaults.h>
@@ -85,9 +84,9 @@ void KBackgroundPattern::init(bool force_rw)
m_File = m_pDirs->findResource("dtop_pattern", m_Name + ".desktop");
if (force_rw || m_File.isEmpty()) {
m_File = m_pDirs->saveLocation("dtop_pattern") + m_Name + ".desktop";
- m_pConfig = new KSimpleConfig(m_File);
+ m_pConfig = new TDESimpleConfig(m_File);
} else
- m_pConfig = new KSimpleConfig(m_File);
+ m_pConfig = new TDESimpleConfig(m_File);
m_pConfig->setGroup("KDE Desktop Pattern");
@@ -252,10 +251,10 @@ void KBackgroundProgram::init(bool force_rw)
m_File = m_pDirs->findResource("dtop_program", m_Name + ".desktop");
if (force_rw || m_File.isEmpty()) {
m_File = m_pDirs->saveLocation("dtop_program") + m_Name + ".desktop";
- m_pConfig = new KSimpleConfig(m_File);
+ m_pConfig = new TDESimpleConfig(m_File);
m_bReadOnly = false;
} else {
- m_pConfig = new KSimpleConfig(m_File);
+ m_pConfig = new TDESimpleConfig(m_File);
m_bReadOnly = (m_File != locateLocal("dtop_program", m_Name + ".desktop"));
}
m_pConfig->setGroup("KDE Desktop Program");
@@ -1276,6 +1275,6 @@ void TDEGlobalBackgroundSettings::writeSettings()
// tell kdesktop to get it's butt in gear and pick up the new settings
TQByteArray data;
- kapp->dcopClient()->send("kdesktop", "KDesktopIface", "configure()", data);
+ tdeApp->dcopClient()->send("kdesktop", "KDesktopIface", "configure()", data);
}
diff --git a/kcontrol/background/bgsettings.h b/kcontrol/background/bgsettings.h
index a49873af2..40b2c68d8 100644
--- a/kcontrol/background/bgsettings.h
+++ b/kcontrol/background/bgsettings.h
@@ -1,5 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
- * kate: space-indent on; indent-width 4; indent-mode cstyle;
+/*
*
* This file is part of the KDE project, module kdesktop.
* Copyright (C) 1999 Geert Jansen <g.t.jansen@stud.tue.nl>
@@ -18,7 +17,7 @@
template <class TQString, class T> class TQMap;
class TDEStandardDirs;
-class KSimpleConfig;
+class TDESimpleConfig;
class TDEConfig;
class TQString;
class TQImage;
@@ -67,7 +66,7 @@ private:
TQString m_Name, m_Comment;
TQString m_Pattern, m_File;
TDEStandardDirs *m_pDirs;
- KSimpleConfig *m_pConfig;
+ TDESimpleConfig *m_pConfig;
};
@@ -138,7 +137,7 @@ private:
TQString m_PreviewCommand, m_Comment;
TQString m_Executable, m_File;
TDEStandardDirs *m_pDirs;
- KSimpleConfig *m_pConfig;
+ TDESimpleConfig *m_pConfig;
};
diff --git a/kcontrol/background/bgwallpaper.cpp b/kcontrol/background/bgwallpaper.cpp
index 5e43caa4d..f75151247 100644
--- a/kcontrol/background/bgwallpaper.cpp
+++ b/kcontrol/background/bgwallpaper.cpp
@@ -1,4 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
+/*
This file is part of the KDE project, module kcmbackground.
@@ -30,7 +30,7 @@
#include <tdefiledialog.h>
#include <kimageio.h>
#include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kurldrag.h>
#include "bgsettings.h"
@@ -114,11 +114,11 @@ BGMultiWallpaperDialog::BGMultiWallpaperDialog(KBackgroundSettings *settings,
if (m_pSettings->multiWallpaperMode() == KBackgroundSettings::Random)
dlg->m_cbRandom->setChecked(true);
- connect(dlg->m_buttonAdd, TQT_SIGNAL(clicked()), TQT_SLOT(slotAdd()));
- connect(dlg->m_buttonRemove, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemove()));
- connect(dlg->m_buttonMoveUp, TQT_SIGNAL(clicked()), TQT_SLOT(slotMoveUp()));
- connect(dlg->m_buttonMoveDown, TQT_SIGNAL(clicked()), TQT_SLOT(slotMoveDown()));
- connect(dlg->m_listImages, TQT_SIGNAL(clicked ( TQListBoxItem * )), TQT_SLOT(slotItemSelected( TQListBoxItem *)));
+ connect(dlg->m_buttonAdd, TQ_SIGNAL(clicked()), TQ_SLOT(slotAdd()));
+ connect(dlg->m_buttonRemove, TQ_SIGNAL(clicked()), TQ_SLOT(slotRemove()));
+ connect(dlg->m_buttonMoveUp, TQ_SIGNAL(clicked()), TQ_SLOT(slotMoveUp()));
+ connect(dlg->m_buttonMoveDown, TQ_SIGNAL(clicked()), TQ_SLOT(slotMoveDown()));
+ connect(dlg->m_listImages, TQ_SIGNAL(clicked ( TQListBoxItem * )), TQ_SLOT(slotItemSelected( TQListBoxItem *)));
dlg->m_buttonRemove->setEnabled( false );
dlg->m_buttonMoveUp->setEnabled( false );
dlg->m_buttonMoveDown->setEnabled( false );
diff --git a/kcontrol/background/bgwallpaper.h b/kcontrol/background/bgwallpaper.h
index dfee2066e..6a61516ee 100644
--- a/kcontrol/background/bgwallpaper.h
+++ b/kcontrol/background/bgwallpaper.h
@@ -1,4 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
+/*
This file is part of the KDE project, module kcmbackground.
@@ -44,7 +44,7 @@ public:
class BGMultiWallpaperDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
BGMultiWallpaperDialog(KBackgroundSettings *settings, TQWidget *parent, const char *name=0);
diff --git a/kcontrol/background/crossfade.h b/kcontrol/background/crossfade.h
index da589aac4..4a9bc2b30 100644
--- a/kcontrol/background/crossfade.h
+++ b/kcontrol/background/crossfade.h
@@ -1,5 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
- * kate: space-indent on; tab-width 8; indent-width 4; indent-mode cstyle;
+/*
*
* This file is part of the KDE project, module kdesktop.
* Copyright (C) 1999,2000 Geert Jansen <jansen@kde.org>
diff --git a/kcontrol/background/main.cpp b/kcontrol/background/main.cpp
index 2f6832dcc..23478b5e1 100644
--- a/kcontrol/background/main.cpp
+++ b/kcontrol/background/main.cpp
@@ -1,4 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
+/*
* This file is part of the KDE project, module kcmbackground.
* Copyright (C) 1999 Geert Jansen <g.t.jansen@stud.tue.nl>
* Copyright (C) 2003 Waldo Bastian <bastian@kde.org>
@@ -65,7 +65,7 @@ KBackground::KBackground(TQWidget *parent, const char *name, const TQStringList
// reparenting that is done.
setAcceptDrops(true);
- connect(m_base, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool)));
+ connect(m_base, TQ_SIGNAL(changed(bool)), TQ_SIGNAL(changed(bool)));
TDEAboutData *about =
new TDEAboutData(I18N_NOOP("kcmbackground"), I18N_NOOP("TDE Background Control Module"),
@@ -100,7 +100,7 @@ void KBackground::save()
m_base->save();
// reconfigure kdesktop. kdesktop will notify all clients
- DCOPClient *client = kapp->dcopClient();
+ DCOPClient *client = tdeApp->dcopClient();
if (!client->isAttached())
client->attach();
diff --git a/kcontrol/background/main.h b/kcontrol/background/main.h
index 9fdba57b8..d4442b340 100644
--- a/kcontrol/background/main.h
+++ b/kcontrol/background/main.h
@@ -1,4 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
+/*
*
* This file is part of the KDE project, module kcmdisplay.
* Copyright (C) 1999 Geert Jansen <g.t.jansen@stud.tue.nl>
@@ -20,7 +20,7 @@ class BGDialog;
*/
class KBackground: public TDECModule
{
- Q_OBJECT
+ TQ_OBJECT
public:
KBackground(TQWidget *parent, const char *name, const TQStringList &);
generated by cgit v1.2.3 (git 2.46.0) at 2025-12-01 20:49:34 +0000