diff options
Diffstat (limited to 'kcontrol/colors')
| -rw-r--r-- | kcontrol/colors/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | kcontrol/colors/colors.desktop | 234 | ||||
| -rw-r--r-- | kcontrol/colors/colorscm.cpp | 64 | ||||
| -rw-r--r-- | kcontrol/colors/colorscm.h | 2 | ||||
| -rw-r--r-- | kcontrol/colors/widgetcanvas.cpp | 24 | ||||
| -rw-r--r-- | kcontrol/colors/widgetcanvas.h | 2 |
6 files changed, 49 insertions, 282 deletions
diff --git a/kcontrol/colors/CMakeLists.txt b/kcontrol/colors/CMakeLists.txt index e5cab510f..503dc1d49 100644 --- a/kcontrol/colors/CMakeLists.txt +++ b/kcontrol/colors/CMakeLists.txt @@ -22,7 +22,10 @@ link_directories( ##### other data ################################ -install( FILES colors.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) +tde_create_translated_desktop( + SOURCE colors.desktop + PO_DIR kcontrol-desktops +) ##### kcm_colors (module) ####################### diff --git a/kcontrol/colors/colors.desktop b/kcontrol/colors/colors.desktop index 51423b62e..b9c7337ad 100644 --- a/kcontrol/colors/colors.desktop +++ b/kcontrol/colors/colors.desktop @@ -10,243 +10,9 @@ X-TDE-FactoryName=colors X-TDE-ParentApp=kcontrol Name=Colors -Name[af]=Kleure -Name[ar]=الألوان -Name[az]=Rənglər -Name[be]=Колеры -Name[bg]=Цветове -Name[bn]=রং -Name[br]=Livioù -Name[bs]=Boje -Name[cs]=Barvy -Name[csb]=Farwë -Name[cy]=Lliwiau -Name[da]=Farver -Name[de]=Farben -Name[el]=Χρώματα -Name[en_GB]=Colours -Name[eo]=Koloroj -Name[es]=Colores -Name[et]=Värvid -Name[eu]=Koloreak -Name[fa]=رنگها -Name[fi]=Värit -Name[fo]=Litir -Name[fr]=Couleurs -Name[fy]=Kleuren -Name[ga]=Dathanna -Name[gl]=Cores -Name[he]=צבעים -Name[hi]=रंग -Name[hr]=Boje -Name[hu]=Színek -Name[id]=Warna -Name[is]=Litir -Name[it]=Colori -Name[ja]=色 -Name[ka]=ცვეტები -Name[kk]=Түстер -Name[km]=ពណ៌ -Name[ko]=색 -Name[lo]=ສີ -Name[lt]=Spalvos -Name[lv]=Krāsas -Name[mk]=Бои -Name[mn]=Өнгө -Name[ms]=Warna -Name[mt]=Kuluri -Name[nb]=Farger -Name[nds]=Klören -Name[ne]=रङ -Name[nl]=Kleuren -Name[nn]=Fargar -Name[nso]=Mebala -Name[pa]=ਰੰਗ -Name[pl]=Kolory -Name[pt]=Cores -Name[pt_BR]=Cores -Name[ro]=Culori -Name[ru]=Цвета -Name[rw]=Amabara -Name[se]=Ivnnit -Name[sk]=Farby -Name[sl]=Barve -Name[sr]=Боје -Name[sr@Latn]=Boje -Name[ss]=Imibala -Name[sv]=Färger -Name[ta]=வண்ணங்கள் -Name[te]=రంగులు -Name[tg]=Рангҳо -Name[th]=สี -Name[tr]=Renkler -Name[tt]=Töslär -Name[uk]=Кольори -Name[uz]=Ranglar -Name[uz@cyrillic]=Ранглар -Name[ven]=Mivhala -Name[vi]=Màu -Name[wa]=Coleurs -Name[xh]=Imibala -Name[zh_CN]=颜色 -Name[zh_TW]=顏色 -Name[zu]=Imibala Comment=Color settings -Comment[af]=Kleur instellings -Comment[ar]=ضبط الألوان -Comment[az]=Rəng qurğuları -Comment[be]=Настаўленне колераў -Comment[bg]=Настройване цветовете на системата -Comment[bn]=রং সেটিংস -Comment[br]=Kefluniañ al livioù -Comment[bs]=Podešavanje boja -Comment[ca]=Arranjament dels colors -Comment[cs]=Nastavení barev -Comment[csb]=Ùstôw farwów -Comment[cy]=Gosodiadau lliwiau -Comment[da]=Farveindstillinger -Comment[de]=Einstellung der Bildschirmfarben -Comment[el]=Ρυθμίσεις χρωμάτων -Comment[en_GB]=Colour settings -Comment[eo]=Agordo de la koloroj -Comment[es]=Preferencias sobre los colores -Comment[et]=Värvide seadistused -Comment[eu]=Koloreen konfigurazioa -Comment[fa]=تنطیمات رنگها -Comment[fi]=Väriasetukset -Comment[fo]=Lituppseting -Comment[fr]=Configuration des couleurs -Comment[fy]=Kleuren ynstelle -Comment[ga]=Socruithe na ndathanna -Comment[gl]=Configuración das cores -Comment[he]=שינוי הגדרות הצבעים -Comment[hi]=रंग विन्यास -Comment[hr]=Postava boja -Comment[hu]=Színbeállítások -Comment[id]=Seting warna -Comment[is]=Stillingar lita -Comment[it]=Impostazioni dei colori -Comment[ja]=色の設定 -Comment[ka]=ფერების კონფიგურაცია -Comment[kk]=Түстерді орнату -Comment[km]=ការកំណត់ពណ៌ -Comment[ko]=색 설정 -Comment[lo]=ຕັ້ງຄ່າສີ -Comment[lt]=Spalvų parametrai -Comment[lv]=Krāsu uzstādījumi -Comment[mk]=Поставувања за боите -Comment[mn]=Дэлгэцийн өнгө тохируулах -Comment[ms]=Seting warna -Comment[mt]=Konfigurazzjoni tal-kuluri -Comment[nb]=Fargeinnstillinger -Comment[nds]=Klören instellen -Comment[ne]=रङ सेटिङ -Comment[nl]=Kleuren instellen -Comment[nn]=Fargeinnstillingar -Comment[nso]=Dipeakanyo tsa mebala -Comment[oc]=Arranjament dèus colors -Comment[pa]=ਰੰਗ ਸੈਟਿੰਗ -Comment[pl]=Ustawienia kolorów -Comment[pt]=Configuração das cores -Comment[pt_BR]=Configurações de cor -Comment[ro]=Configurează culorile ferestrelor -Comment[ru]=Настройка цветов -Comment[rw]=Amagenamiterere y'ibara -Comment[se]=Ivdneheivehusat -Comment[sk]=Nastavenie farieb -Comment[sl]=Nastavitve barv -Comment[sr]=Поставке боја -Comment[sr@Latn]=Postavke boja -Comment[ss]=Kuhleleka kwembala -Comment[sv]=Anpassa färger -Comment[ta]=வண்ண அமைப்புகள் -Comment[te]=రంగుల అమరికలు -Comment[tg]=Танзимоти ранг -Comment[th]=ตั้งค่าสี -Comment[tr]=Renk ayarları -Comment[tt]=Tös caylaw -Comment[uk]=Налаштування кольорів -Comment[uz]=Ranglarning moslamalari -Comment[uz@cyrillic]=Рангларнинг мосламалари -Comment[ven]=Mavhekanyele a muvhala -Comment[vi]=Thiết lập màu -Comment[wa]=Apontiaedje des coleurs -Comment[xh]=Izicwangciso zombala -Comment[zh_CN]=颜色设置 -Comment[zh_TW]=顏色設定 -Comment[zu]=Izilungiso zombala Keywords=colors;colours;scheme;contrast;Widget colors;Color Scheme; -Keywords[af]=colors;colours;Skema;contrast;Widget colors;Color Skema; -Keywords[az]=rənglər;sxem;kontrast;Rəng Cədvəli; -Keywords[be]=колеры;схема;кантраст;колеры віджэтаў;колерная схема;colors;colours;scheme;contrast;Widget colors;Color Scheme; -Keywords[bg]=цветове; схема; цветова; colors; colours; scheme; contrast; Widget colors; Color Scheme; -Keywords[ca]=colors;esquema;contrast;colors d'estri;esquema de color; -Keywords[cs]=Barvy;Schéma;Kontrast;Barevná schémata; -Keywords[csb]=farwa;schema;kòntrast;farwë elementów òknów;schema farwów; -Keywords[cy]=lliwiau;cynlluniau;cyferbyniad;lliwiau celfigion;Cynllun Lliw; -Keywords[da]=farver;system;kontrast;Kontrolfarver;Farvesammensætning; -Keywords[de]=Farben;Schema;Kontrast;Farbschema;Elemente; -Keywords[el]=χρώματα;χρώματα;θέμα;αντίθεση;Χρώματα γραφικού συστατικού;Θέμα χρωμάτων; -Keywords[en_GB]=colours;scheme;contrast;Widget colours;Colour Scheme; -Keywords[eo]=koloroj;skemo;kontrasto;fenestraĵo-koloroj;koloraro; -Keywords[es]=colores;esquema;contraste;Colores de los objetos visuales;Colores de los widgets;Esquema de colores; -Keywords[et]=värvid;skeem;kontrast;värviskeem; -Keywords[eu]=koloreak;antolamendua;kontrastea;Widget-en koloreak;Kolore eskema; -Keywords[fa]=رنگها، رنگها، طرحواره، سایه روشن، رنگهای عنصر، طرحوارۀ رنگ; -Keywords[fi]=väri;teema;kontrasti;työkalujen värit;väriteema; -Keywords[fo]=litir; -Keywords[fr]=couleurs;modèles de couleurs;contraste;couleur des éléments graphiques;modèle; -Keywords[fy]=kleuren;kleur;skema;kontrast;widgetkleuren;kleurenskema; -Keywords[ga]=dathanna;scéim;codarsnacht;dathanna giuirléidí;Scéim Dathanna; -Keywords[gl]=cor;cores;esquema;contraste;cores dos widgets;Esquema das cores; -Keywords[he]=colors;colours;scheme;contrast;Widget colors;Color;Schemeצבעים;תבנית;חדות;צבע פריטים;תבנית צבעים; -Keywords[hi]=रंग;योजना;कंट्रास्ट;विजेट रंग;रंग योजना; -Keywords[hr]=colors;colours;scheme;contrast;Widget colors;Color Scheme;boja;boje;shema;kontrast;Boje widgeta;Shema bojanja; -Keywords[hu]=színek;séma;kontraszt;elemszín;színösszeállítás; -Keywords[id]=warna;scheme;kontras; warna widget; warna scheme; -Keywords[is]=litir;litur;skema;skerpa; -Keywords[it]=colori;schema;contrasto;colore widget;colore elementi grafici;schema di colori; -Keywords[ja]=色;スキーム;コントラスト;ウィジェット色;色スキーム; -Keywords[km]=ពណ៌;គ្រោងការណ៍;កម្រិតពណ៌;ពណ៌របស់វត្ថុមើលឃើញ;គ្រោងការណ៍ពណ៌; -Keywords[lt]=colors;colours;scheme;contrast;Widget colors;Color Scheme;spalvos;koloritai;schema;kontrastas; Valdiklių spalvos; Spalvų Schema; -Keywords[lv]=krāsu;krāsas;shēma;kontrasts;Vidžeta krāsas;Krāsu Shēma; -Keywords[mk]=colors;colours;scheme;contrast;Widget colors;Color Scheme;бои;шема;контраст;Шема на бои; -Keywords[mn]=Өнгө;Схем;Эрчим;Өнгөний схем;Элемент; -Keywords[ms]=warna;warna;skema; kontras; warna Widget;Skema Warna; -Keywords[nb]=farger;oppsett;kontrast;elementfarger;fargeoppsett; -Keywords[nds]=Klören;Schema;Kontrast;Bedeenelementen;Klöörschema; -Keywords[ne]=रङ; रङ्ग; योजना; व्यतिरेक; विजेट रङ; रङ योजना; -Keywords[nl]=kleuren;kleur;schema;contrast;widgetkleuren;kleurenschema; -Keywords[nn]=fargar;oppsett;kontrast;elementfargar;fargeoppsett; -Keywords[nso]=mebala;mebala;leano;phapano;Mebala ya Widget;Leano la Mmala; -Keywords[pa]=colors;colours;scheme;contrast;Widget colors;Color Scheme;ਰੰਗ;ਸਕੀਮ; -Keywords[pl]=kolory;schemat;kontrast;kolory elementów okienek;schemat kolorów; -Keywords[pt]=cores;esquema;esquema;contraste;cores dos elementos;esquema de cor; -Keywords[pt_BR]=cores;esquema;contraste;cores de controles;Esquema de cor; -Keywords[ro]=culoare;culori;schemă;contrast;componente;schemă de culori; -Keywords[rw]=Amabara;amabara;Igishushanyombonera;inyuranyamigaragarire; Amabara y'akabanga;Igishushombonera cy'ibara; -Keywords[se]=ivnnit;coahkádusat;vuostálasvuohta;áhtaivnnit;ivdnečoahkádus; -Keywords[sk]=farby;schémy;kontrast;farby prvkov;schéma farieb; -Keywords[sl]=barva;barve;sheme;kontrast;nadzor gradnikov;barvna shema; -Keywords[sr]=боје;шема;контраст;шема боја; -Keywords[sr@Latn]=boje;šema;kontrast;šema boja; -Keywords[ss]=mibala;mibala;inhlanganisela;kucatsanisa;mibala yesisetjentiswa;kwakheka kwembala; -Keywords[sv]=färger;schema;kontrast;Komponentfärger;Färgschema; -Keywords[ta]=வண்ணங்கள்;வண்ணங்கள்;திட்டம்;எதிரான;Widget வண்ணங்கள்;வண்ண முறை; -Keywords[tg]=colors;colours;scheme;contrast;Widget colors;Color Scheme;рангҳо;рангҳо; -Keywords[th]=สี;ชุดสี;ความตัดกันของสี;สีของคอนโทรล; -Keywords[tr]=renkler;şema;kontrast;Renk Tablosu; -Keywords[uk]=кольори;схема;контрастність;кольори віджетів;схема кольорів; -Keywords[uz]=ranglar;qolip;kontrast;vidjet ranglari;rang qolipi; -Keywords[uz@cyrillic]=ранглар;қолип;контраст;виджет ранглари;ранг қолипи; -Keywords[ven]=mivhala;mivhala;tshikimu;mbambe;Widget mivhala;Tshikimu tsha Muvhala; -Keywords[vi]=màu;màu sắc;sắc thái;tương phản;Màu của ô điều khiển;Sắc thái Màu; -Keywords[wa]=coleurs;arindjmint;contrasse;coleurs d' ahesse;arindjmint di coleurs;arindjmints d' coleurs; -Keywords[xh]=imibala;imibala;udweliso;isiboniso somahluko;Imibala ye widget;Udweliso Olunombala; -Keywords[zh_CN]=colors;colours;scheme;contrast;Widget colors;Color Scheme;颜色;方案;对比;部件颜色;配色方案; -Keywords[zh_TW]=colors;colours;scheme;contrast;Widget colors;Color Scheme;顏色;對比;元件顏色;配色; -Keywords[zu]=imibala;imibala;iplani;ukugqama;imibala ye-Widget;Iplani Lombala; Categories=Qt;TDE;X-TDE-settings-looknfeel; diff --git a/kcontrol/colors/colorscm.cpp b/kcontrol/colors/colorscm.cpp index b1cc2616a..b91dabc06 100644 --- a/kcontrol/colors/colorscm.cpp +++ b/kcontrol/colors/colorscm.cpp @@ -31,11 +31,11 @@ #include <tdeio/netaccess.h> #include <kipc.h> #include <tdemessagebox.h> -#include <kprocess.h> -#include <kstandarddirs.h> +#include <tdeprocess.h> +#include <tdestandarddirs.h> #include <tdeaboutdata.h> -#if defined Q_WS_X11 && !defined K_WS_QTONLY +#if defined TQ_WS_X11 && !defined K_WS_QTONLY #include <X11/Xlib.h> #include <X11/Xatom.h> #endif @@ -136,10 +136,10 @@ KColorScheme::KColorScheme(TQWidget *parent, const char *name, const TQStringLis " \"Widget color\" box will change to reflect the part of the preview" " image you clicked.") ); - connect( cs, TQT_SIGNAL( widgetSelected( int ) ), - TQT_SLOT( slotWidgetColor( int ) ) ); - connect( cs, TQT_SIGNAL( colorDropped( int, const TQColor&)), - TQT_SLOT( slotColorForWidget( int, const TQColor&))); + connect( cs, TQ_SIGNAL( widgetSelected( int ) ), + TQ_SLOT( slotWidgetColor( int ) ) ); + connect( cs, TQ_SIGNAL( colorDropped( int, const TQColor&)), + TQ_SLOT( slotColorForWidget( int, const TQColor&))); topLayout->addMultiCellWidget( cs, 0, 0, 0, 1 ); TQGroupBox *group = new TQVGroupBox( i18n("Color Scheme"), this ); @@ -149,7 +149,7 @@ KColorScheme::KColorScheme(TQWidget *parent, const char *name, const TQStringLis mSchemeList = new KColorSchemeList(); readSchemeNames(); sList->setCurrentItem( 0 ); - connect(sList, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotPreviewScheme(int))); + connect(sList, TQ_SIGNAL(highlighted(int)), TQ_SLOT(slotPreviewScheme(int))); TQWhatsThis::add( sList, i18n("This is a list of predefined color schemes," " including any that you may have created. You can preview an existing" @@ -160,22 +160,22 @@ KColorScheme::KColorScheme(TQWidget *parent, const char *name, const TQStringLis " another color scheme.") ); addBt = new TQPushButton(i18n("&Save Scheme..."), group); - connect(addBt, TQT_SIGNAL(clicked()), TQT_SLOT(slotAdd())); + connect(addBt, TQ_SIGNAL(clicked()), TQ_SLOT(slotAdd())); TQWhatsThis::add( addBt, i18n("Press this button if you want to save" " the current color settings as a color scheme. You will be" " prompted for a name.") ); removeBt = new TQPushButton(i18n("R&emove Scheme"), group); - removeBt->setEnabled(FALSE); - connect(removeBt, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemove())); + removeBt->setEnabled(false); + connect(removeBt, TQ_SIGNAL(clicked()), TQ_SLOT(slotRemove())); TQWhatsThis::add( removeBt, i18n("Press this button to remove the selected" " color scheme. Note that this button is disabled if you do not have" " permission to delete the color scheme.") ); importBt = new TQPushButton(i18n("I&mport Scheme..."), group); - connect(importBt, TQT_SIGNAL(clicked()),TQT_SLOT(slotImport())); + connect(importBt, TQ_SIGNAL(clicked()),TQ_SLOT(slotImport())); TQWhatsThis::add( importBt, i18n("Press this button to import a new color" " scheme. Note that the color scheme will only be available for the" @@ -221,7 +221,7 @@ KColorScheme::KColorScheme(TQWidget *parent, const char *name, const TQStringLis setColorName(i18n("Alternate Background in Lists"), CSM_Alternate_background); wcCombo->adjustSize(); - connect(wcCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(slotWidgetColor(int))); + connect(wcCombo, TQ_SIGNAL(activated(int)), TQ_SLOT(slotWidgetColor(int))); groupLayout->addWidget(wcCombo); TQWhatsThis::add( wcCombo, i18n("Click here to select an element of" @@ -230,8 +230,8 @@ KColorScheme::KColorScheme(TQWidget *parent, const char *name, const TQStringLis " of the preview image above.") ); colorButton = new KColorButton( group ); - connect( colorButton, TQT_SIGNAL( changed(const TQColor &)), - TQT_SLOT(slotSelectColor(const TQColor &))); + connect( colorButton, TQ_SIGNAL( changed(const TQColor &)), + TQ_SLOT(slotSelectColor(const TQColor &))); groupLayout->addWidget( colorButton ); @@ -241,7 +241,7 @@ KColorScheme::KColorScheme(TQWidget *parent, const char *name, const TQStringLis cbShadeList = new TQCheckBox(i18n("Shade sorted column in lists"), this); stackLayout->addWidget(cbShadeList); - connect(cbShadeList, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotShadeSortColumnChanged(bool))); + connect(cbShadeList, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotShadeSortColumnChanged(bool))); TQWhatsThis::add(cbShadeList, i18n("Check this box to show the sorted column in a list with a shaded background")); @@ -254,10 +254,10 @@ KColorScheme::KColorScheme(TQWidget *parent, const char *name, const TQStringLis groupLayout = new TQHBoxLayout; groupLayout2->addLayout(groupLayout); - sb = new TQSlider( Qt::Horizontal,group,"Slider" ); + sb = new TQSlider( TQt::Horizontal,group,"Slider" ); sb->setRange( 0, 10 ); - sb->setFocusPolicy( TQ_StrongFocus ); - connect(sb, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(sliderValueChanged(int))); + sb->setFocusPolicy( TQWidget::StrongFocus ); + connect(sb, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(sliderValueChanged(int))); TQWhatsThis::add(sb, i18n("Use this slider to change the contrast level" " of the current color scheme. Contrast does not affect all of the" @@ -272,7 +272,7 @@ KColorScheme::KColorScheme(TQWidget *parent, const char *name, const TQStringLis cbExportColors = new TQCheckBox(i18n("Apply colors to &non-TDE applications"), this); topLayout->addMultiCellWidget( cbExportColors, 2, 2, 0, 1 ); - connect(cbExportColors, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(changed())); + connect(cbExportColors, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(changed())); TQWhatsThis::add(cbExportColors, i18n("Check this box to apply the" " current color scheme to non-TDE applications.")); @@ -371,8 +371,8 @@ void KColorScheme::save() cfg->sync(); // KDE-1.x support - KSimpleConfig *config = - new KSimpleConfig( TQDir::homeDirPath() + "/.tderc" ); + TDESimpleConfig *config = + new TDESimpleConfig( TQDir::homeDirPath() + "/.tderc" ); config->setGroup( "General" ); config->writeEntry("background", cs->back ); config->writeEntry("selectBackground", cs->select ); @@ -396,7 +396,7 @@ void KColorScheme::save() flags |= KRdbExportColors; else { -#if defined Q_WS_X11 && !defined K_WS_QTONLY +#if defined TQ_WS_X11 && !defined K_WS_QTONLY // Undo the property xrdb has placed on the root window (if any), // i.e. remove all entries, including ours XDeleteProperty( tqt_xdisplay(), tqt_xrootwin(), XA_RESOURCE_MANAGER ); @@ -443,7 +443,7 @@ void KColorScheme::slotSave( ) KColorSchemeEntry *entry = mSchemeList->at(sList->currentItem()-nSysSchemes); if (!entry) return; sCurrentScheme = entry->path; - KSimpleConfig *config = new KSimpleConfig(sCurrentScheme ); + TDESimpleConfig *config = new TDESimpleConfig(sCurrentScheme ); int i = sCurrentScheme.findRev('/'); if (i >= 0) sCurrentScheme = sCurrentScheme.mid(i+1); @@ -550,8 +550,8 @@ void KColorScheme::slotAdd() valid = true; } - disconnect(sList, TQT_SIGNAL(highlighted(int)), this, - TQT_SLOT(slotPreviewScheme(int))); + disconnect(sList, TQ_SIGNAL(highlighted(int)), this, + TQ_SLOT(slotPreviewScheme(int))); if (exists != -1) { @@ -561,7 +561,7 @@ void KColorScheme::slotAdd() else { sFile = TDEGlobal::dirs()->saveLocation("data", "tdedisplay/color-schemes/") + sFile + ".kcsrc"; - KSimpleConfig *config = new KSimpleConfig(sFile); + TDESimpleConfig *config = new TDESimpleConfig(sFile); config->setGroup( "Color Scheme"); config->writeEntry("Name", sName); delete config; @@ -574,7 +574,7 @@ void KColorScheme::slotAdd() TQPixmap preview = mkColorPreview(cs); int current = sList->currentItem(); sList->changeItem(preview, sList->text(current), current); - connect(sList, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotPreviewScheme(int))); + connect(sList, TQ_SIGNAL(highlighted(int)), TQ_SLOT(slotPreviewScheme(int))); slotPreviewScheme(current); } @@ -595,7 +595,7 @@ void KColorScheme::slotImport() else { TQString sFile = location + file.fileName( false ); - KSimpleConfig *config = new KSimpleConfig(sFile); + TDESimpleConfig *config = new TDESimpleConfig(sFile); config->setGroup( "Color Scheme"); TQString sName = config->readEntry("Name", i18n("Untitled Theme")); delete config; @@ -605,7 +605,7 @@ void KColorScheme::slotImport() TQPixmap preview = mkColorPreview(cs); int current = sList->currentItem(); sList->changeItem(preview, sList->text(current), current); - connect(sList, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotPreviewScheme(int))); + connect(sList, TQ_SIGNAL(highlighted(int)), TQ_SLOT(slotPreviewScheme(int))); slotPreviewScheme(current); } } @@ -798,7 +798,7 @@ void KColorScheme::readScheme( int index ) KColorSchemeEntry *entry = mSchemeList->at(sList->currentItem()-nSysSchemes); if (!entry) return; sCurrentScheme = entry->path; - config = new KSimpleConfig(sCurrentScheme, true); + config = new TDESimpleConfig(sCurrentScheme, true); config->setGroup("Color Scheme"); int i = sCurrentScheme.findRev('/'); if (i >= 0) @@ -865,7 +865,7 @@ void KColorScheme::readSchemeNames() // And add them for (TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it) { - KSimpleConfig *config = new KSimpleConfig(*it); + TDESimpleConfig *config = new TDESimpleConfig(*it); config->setGroup("Color Scheme"); TQString str = config->readEntry("Name"); if (str.isEmpty()) { diff --git a/kcontrol/colors/colorscm.h b/kcontrol/colors/colorscm.h index ca8718f74..228204556 100644 --- a/kcontrol/colors/colorscm.h +++ b/kcontrol/colors/colorscm.h @@ -36,7 +36,7 @@ class KColorSchemeList; */ class KColorScheme: public TDECModule { - Q_OBJECT + TQ_OBJECT public: KColorScheme(TQWidget *parent, const char *name, const TQStringList &); diff --git a/kcontrol/colors/widgetcanvas.cpp b/kcontrol/colors/widgetcanvas.cpp index b08ef6135..3ee662627 100644 --- a/kcontrol/colors/widgetcanvas.cpp +++ b/kcontrol/colors/widgetcanvas.cpp @@ -315,7 +315,7 @@ void WidgetCanvas::drawSampleWidgets() // Create a scrollbar and redirect drawing into a temp. pixmap to save a // lot of fiddly drawing later. - TQScrollBar *vertScrollBar = new TQScrollBar( Qt::Vertical, this ); + TQScrollBar *vertScrollBar = new TQScrollBar( TQt::Vertical, this ); // TODO: vertScrollBar->setStyle( new TQMotifStyle() ); vertScrollBar->setGeometry( 400, 400, SCROLLBAR_SIZE, height()); vertScrollBar->setRange( 0, 0 ); @@ -324,9 +324,7 @@ void WidgetCanvas::drawSampleWidgets() TQPixmap pm( vertScrollBar->width(), vertScrollBar->height() ); pm.fill( back ); -#ifndef __osf__ TQPainter::redirect( vertScrollBar, &pm ); -#endif vertScrollBar->repaint(); TQPainter::redirect( vertScrollBar, 0 ); vertScrollBar->hide(); @@ -346,7 +344,7 @@ void WidgetCanvas::drawSampleWidgets() // Inactive window - qDrawWinPanel ( &paint, 15, 5, width()-48, height(), cg, FALSE, + qDrawWinPanel ( &paint, 15, 5, width()-48, height(), cg, false, &brush); paint.setBrush( iaTitle ); @@ -394,7 +392,7 @@ void WidgetCanvas::drawSampleWidgets() // Active window - qDrawWinPanel ( &paint, 20, 25+5, width()-40, height(), cg, FALSE, + qDrawWinPanel ( &paint, 20, 25+5, width()-40, height(), cg, false, &brush); paint.setBrush( aTitle );paint.setPen( aTitle ); @@ -434,16 +432,16 @@ void WidgetCanvas::drawSampleWidgets() // Menu bar - //qDrawShadePanel ( &paint, 25, 55, width()-52, 28, cg, FALSE, 2, &brush); - kapp->style().tqdrawPrimitive(TQStyle::PE_PanelMenuBar, &paint, + //qDrawShadePanel ( &paint, 25, 55, width()-52, 28, cg, false, 2, &brush); + tdeApp->style().drawPrimitive(TQStyle::PE_PanelMenuBar, &paint, TQRect(TQPoint(25, 55), TQSize(width()-52, 28)), cg); paint.setFont( menuFont ); paint.setPen(txt ); TQString file = i18n("File"); textLen = paint.fontMetrics().width( file ); - //qDrawShadePanel ( &paint, 30, 59, textLen + 10, 21, cg, FALSE, 2, &brush); - kapp->style().tqdrawPrimitive(TQStyle::PE_Panel, &paint, + //qDrawShadePanel ( &paint, 30, 59, textLen + 10, 21, cg, false, 2, &brush); + tdeApp->style().drawPrimitive(TQStyle::PE_Panel, &paint, TQRect(30, 59, textLen + 10, 21), cg); paint.drawText( 35, 74, file ); @@ -465,7 +463,7 @@ void WidgetCanvas::drawSampleWidgets() brush.setColor( window ); qDrawShadePanel ( &paint, 25, 80+5-4, width()-7-45-2, - height(), cg, TRUE, 2, &brush); + height(), cg, true, 2, &brush); // Standard text TQFont fnt = TDEGlobalSettings::generalFont(); @@ -528,7 +526,7 @@ void WidgetCanvas::drawSampleWidgets() cg2.setColor(TQColorGroup::Button, button); cg2.setColor(TQColorGroup::Background, window); //qDrawWinButton(&paint, xpos, ypos, textLen+32, 28, cg, false, &brush); - kapp->style().tqdrawPrimitive(TQStyle::PE_ButtonCommand, &paint, + tdeApp->style().drawPrimitive(TQStyle::PE_ButtonCommand, &paint, TQRect(xpos, ypos, textLen+32, 28), cg2, TQStyle::Style_Enabled | TQStyle::Style_Raised); paint.setPen(buttonTxt); paint.drawText(xpos, ypos, textLen+32, 28, AlignCenter, @@ -585,12 +583,12 @@ void WidgetCanvas::drawSampleWidgets() // Valance qDrawWinPanel ( &paint, 0, 0, width(), height(), - parentWidget()->colorGroup(), TRUE, 0); + parentWidget()->colorGroup(), true, 0); // Stop the painting hotspots[ spot++ ] = HotSpot( TQRect( 0, 0, width(), height() ), CSM_Background ); // ? - repaint( FALSE ); + repaint( false ); } diff --git a/kcontrol/colors/widgetcanvas.h b/kcontrol/colors/widgetcanvas.h index 60898622b..220b244cc 100644 --- a/kcontrol/colors/widgetcanvas.h +++ b/kcontrol/colors/widgetcanvas.h @@ -61,7 +61,7 @@ public: class WidgetCanvas : public TQWidget { - Q_OBJECT + TQ_OBJECT public: WidgetCanvas( TQWidget *parent=0, const char *name=0 ); |