diff options
Diffstat (limited to 'kcontrol/randr')
-rw-r--r-- | kcontrol/randr/CMakeLists.txt | 22 | ||||
-rw-r--r-- | kcontrol/randr/configdialog.cpp | 1 | ||||
-rw-r--r-- | kcontrol/randr/configdialog.h | 3 | ||||
-rw-r--r-- | kcontrol/randr/ktimerdialog.cpp | 10 | ||||
-rw-r--r-- | kcontrol/randr/ktimerdialog.h | 8 | ||||
-rw-r--r-- | kcontrol/randr/randr.desktop | 203 | ||||
-rw-r--r-- | kcontrol/randr/tderandrapp.cpp | 4 | ||||
-rw-r--r-- | kcontrol/randr/tderandrapp.h | 6 | ||||
-rw-r--r-- | kcontrol/randr/tderandrbindings.cpp | 3 | ||||
-rw-r--r-- | kcontrol/randr/tderandrmodule.cpp | 20 | ||||
-rw-r--r-- | kcontrol/randr/tderandrmodule.h | 2 | ||||
-rw-r--r-- | kcontrol/randr/tderandrpassivepopup.cpp | 8 | ||||
-rw-r--r-- | kcontrol/randr/tderandrpassivepopup.h | 2 | ||||
-rw-r--r-- | kcontrol/randr/tderandrtray-autostart.desktop | 126 | ||||
-rw-r--r-- | kcontrol/randr/tderandrtray.cpp | 329 | ||||
-rw-r--r-- | kcontrol/randr/tderandrtray.desktop | 126 | ||||
-rw-r--r-- | kcontrol/randr/tderandrtray.h | 10 |
17 files changed, 230 insertions, 653 deletions
diff --git a/kcontrol/randr/CMakeLists.txt b/kcontrol/randr/CMakeLists.txt index d1f31af8c..1101f1ee1 100644 --- a/kcontrol/randr/CMakeLists.txt +++ b/kcontrol/randr/CMakeLists.txt @@ -11,6 +11,7 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_BINARY_DIR} ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} ) @@ -22,9 +23,22 @@ link_directories( ##### other data ################################ -install( FILES tderandrtray.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) -install( FILES randr.desktop DESTINATION ${APPS_INSTALL_DIR}/.hidden ) -install( FILES tderandrtray-autostart.desktop DESTINATION ${AUTOSTART_INSTALL_DIR} ) +tde_create_translated_desktop( + SOURCE tderandrtray.desktop + PO_DIR kcontrol-desktops +) + +tde_create_translated_desktop( + SOURCE randr.desktop + DESTINATION ${APPS_INSTALL_DIR}/.hidden + PO_DIR kcontrol-desktops +) + +tde_create_translated_desktop( + SOURCE tderandrtray-autostart.desktop + DESTINATION ${AUTOSTART_INSTALL_DIR} + PO_DIR kcontrol-desktops +) ##### kcm_randr (module) ######################## @@ -42,6 +56,6 @@ tde_add_executable( tderandrtray AUTOMOC SOURCES main.cpp tderandrtray.cpp tderandrapp.cpp tderandrpassivepopup.cpp configdialog.cpp - LINK tdeutils-shared tderandr-shared + LINK tdeutils-shared tderandr-shared ${TDEHW_LIBRARIES} DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/kcontrol/randr/configdialog.cpp b/kcontrol/randr/configdialog.cpp index 5ed71aa6d..88ec261f2 100644 --- a/kcontrol/randr/configdialog.cpp +++ b/kcontrol/randr/configdialog.cpp @@ -1,4 +1,3 @@ -// -*- Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 8; -*- /* This file is part of the KDE project Copyright (C) 2000 by Carsten Pfeiffer <pfeiffer@kde.org> diff --git a/kcontrol/randr/configdialog.h b/kcontrol/randr/configdialog.h index 0728146ee..1b6a5faac 100644 --- a/kcontrol/randr/configdialog.h +++ b/kcontrol/randr/configdialog.h @@ -1,4 +1,3 @@ -// -*- Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 8; -*- /* This file is part of the KDE project Copyright (C) 2000 by Carsten Pfeiffer <pfeiffer@kde.org> @@ -42,7 +41,7 @@ class ConfigDialog; class ConfigDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: ConfigDialog(TDEGlobalAccel *accel, bool isApplet ); diff --git a/kcontrol/randr/ktimerdialog.cpp b/kcontrol/randr/ktimerdialog.cpp index 1aa0f58df..140234a90 100644 --- a/kcontrol/randr/ktimerdialog.cpp +++ b/kcontrol/randr/ktimerdialog.cpp @@ -35,9 +35,9 @@ #include "ktimerdialog.h" #include "ktimerdialog.moc" -KTimerDialog::KTimerDialog( int msec, TimerStyle style, QWidget *parent, +KTimerDialog::KTimerDialog( int msec, TimerStyle style, TQWidget *parent, const char *name, bool modal, - const QString &caption, + const TQString &caption, int buttonMask, ButtonCode defaultButton, bool separator, const KGuiItem &user1, @@ -56,8 +56,8 @@ KTimerDialog::KTimerDialog( int msec, TimerStyle style, QWidget *parent, if ( buttonMask & Cancel ) buttonOnTimeout = Cancel; - connect( totalTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotInternalTimeout() ) ); - connect( updateTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotUpdateTime() ) ); + connect( totalTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotInternalTimeout() ) ); + connect( updateTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotUpdateTime() ) ); // create the widgets mainWidget = new QVBox( this, "mainWidget" ); @@ -90,7 +90,7 @@ int KTimerDialog::exec() return KDialogBase::exec(); } -void KTimerDialog::setMainWidget( QWidget *widget ) +void KTimerDialog::setMainWidget( TQWidget *widget ) { // yuck, here goes. QVBox *newWidget = new QVBox( this ); diff --git a/kcontrol/randr/ktimerdialog.h b/kcontrol/randr/ktimerdialog.h index 23b4a92b0..74891d048 100644 --- a/kcontrol/randr/ktimerdialog.h +++ b/kcontrol/randr/ktimerdialog.h @@ -44,7 +44,7 @@ class QLabel; */ class KTimerDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: @@ -67,9 +67,9 @@ class KTimerDialog : public KDialogBase * * For the rest of the arguments, See @see KDialogBase . */ - KTimerDialog( int msec, TimerStyle style=CountDown, QWidget *parent=0, + KTimerDialog( int msec, TimerStyle style=CountDown, TQWidget *parent=0, const char *name=0, bool modal=true, - const QString &caption=QString::null, + const TQString &caption=TQString::null, int buttonMask=Ok|Apply|Cancel, ButtonCode defaultButton=Ok, bool separator=false, const KGuiItem &user1=KGuiItem(), @@ -117,7 +117,7 @@ class KTimerDialog : public KDialogBase * Overridden function which is used to set the main widget of the dialog. * @see KDialogBase::setMainWidget. */ - void setMainWidget( QWidget *widget ); + void setMainWidget( TQWidget *widget ); signals: /** diff --git a/kcontrol/randr/randr.desktop b/kcontrol/randr/randr.desktop index eedfc8e52..f4d558e80 100644 --- a/kcontrol/randr/randr.desktop +++ b/kcontrol/randr/randr.desktop @@ -7,210 +7,7 @@ X-TDE-Library=randr X-TDE-Test-Module=true Name=Size & Orientation -Name[af]=Grootte & Ooriëntasie -Name[ar]=القياس و الإتجاه -Name[be]=Памеры і арыентацыя -Name[bg]=Размер и ротация на екрана -Name[bn]=আকৃতি এবং দিশা -Name[br]=Ment ha reteradur -Name[bs]=Veličina i orijentacija -Name[ca]=Mida i orientació -Name[cs]=Velikost a orientace -Name[csb]=Miara ë pòłóżenié -Name[cy]=Maint & Cyfeiriad -Name[da]=Størrelse & Orientering -Name[de]=Größe & Ausrichtung -Name[el]=Μέγεθος & Προσανατολισμός -Name[eo]=Grandeco kaj direkto -Name[es]=Tamaño y orientación -Name[et]=Suurus ja orientatsioon -Name[eu]=Tamaina eta orientazioa -Name[fa]=اندازه و جهت -Name[fi]=Koko ja suunta -Name[fr]=Taille et orientation -Name[fy]=Grutte en oriïntaasje -Name[ga]=Méid agus Treoshuíomh -Name[gl]=Tamaño e Orientación -Name[he]=גודל וכיוון -Name[hi]=आकार व दिशा निर्धारण -Name[hr]=Veličina i orijentacija -Name[hu]=Képernyőfelbontás -Name[is]=Stærð og snúningur -Name[it]=Dimensione e orientazione -Name[ja]=サイズと配置 -Name[ka]=ზომა და ორიენტაცია -Name[kk]=Өлшем және бағыт -Name[km]=ទំហំ & ទិស -Name[ko]=해상도와 회전 -Name[lt]=Dydis ir orientacija -Name[lv]=Izmērs un orientācija -Name[mk]=Големина и ориентација -Name[mn]=Хэмжээ & Чиглэл -Name[ms]=Saiz & Orientasi -Name[mt]=Daqs u Orjentazzjoni -Name[nb]=Størrelse og retning -Name[nds]=Grött & Utrichten -Name[ne]=साइज र अभिमुखीकरण -Name[nl]=Grootte en oriëntatie -Name[nn]=Storleik og retning -Name[pa]=ਆਕਾਰ ਅਤੇ ਸਥਿਤੀ -Name[pl]=Rozmiar i orientacja -Name[pt]=Tamanho e Orientação -Name[pt_BR]=Tamanho & Orientação -Name[ro]=Mărime și orientare -Name[ru]=Размер и ориентация -Name[rw]=Ingano & Icyerekezo -Name[se]=Sturrodat ja joraheapmi -Name[sk]=Veľkosť a orientácia -Name[sl]=Velikost in orientacija -Name[sr]=Величина и оријентација -Name[sr@Latn]=Veličina i orijentacija -Name[sv]=Storlek och orientering -Name[ta]=அளவும் திசையும் -Name[tg]=Андоза ва шиносоӣ -Name[th]=ขนาดและการวางแนว -Name[tr]=Konum ve Boyut -Name[tt]=Ülçäm belän Yünälü -Name[uk]=Розмір та орієнтація -Name[uz]=Oʻlchami va joylashishi -Name[uz@cyrillic]=Ўлчами ва жойлашиши -Name[vi]=Cỡ & Hướng -Name[wa]=Grandeu eyet oryintåcion -Name[zh_CN]=大小和方向 -Name[zh_TW]=尺寸及定位 Comment=Resize and Rotate your display -Comment[af]=Hervergroot en Roteer jou skerm -Comment[ar]=غيّر القياس و دوران شاشتك -Comment[be]=Змяняе памеры і перагортвае ваш экран -Comment[bg]=Настройване на размера и завъртането на екрана -Comment[bn]=আপনার ডিসপ্লের আকৃতি এবং দিশা পরিবর্তন করুন -Comment[br]=Adventañ ha treiñ ho skramm -Comment[bs]=Podesite veličinu i rotirajte vaš ekran -Comment[ca]=Amida i gira la vostra pantalla -Comment[cs]=Změna velikosti a rotace obrazovky -Comment[csb]=Zjinaka miarë ë pòłożenia ekranu -Comment[cy]=Newid Maint a Cylchdroi eich dangosydd -Comment[da]=Ændrer størrelse og roterer din visning -Comment[de]=Größe und Ausrichtung der Anzeige ändern -Comment[el]=Αλλαγή μεγέθους και Περιστροφή της οθόνης σας -Comment[eo]=Grandigi kaj turni vian ekranblokon -Comment[es]=Ajustar el tamaño y rotar la pantalla -Comment[et]=Oma vaate suuruse muutmine ja pööramine -Comment[eu]=Aldatu tamaina eta biratu zure pantaila -Comment[fa]=تغییر اندازه و چرخش صفحه نمایش شما -Comment[fi]=Resoluution muuttaminen ja ruudun kääntäminen -Comment[fr]=Redimensionner et Tourner votre affichage -Comment[fy]=Wizigje it skermgrutte en rotearje dizze -Comment[gl]=Redimensionar e rotar a sua pantalla -Comment[he]=שנה את גודלה של התצוגה שלך וסובב אותה -Comment[hi]=अपने शक्ल-सूरत(डिस्प्ले) का आकार बदलें तथा घुमाएँ -Comment[hr]=Promijena veličine i orijentacije zaslona -Comment[hu]=A képernyő átméretezése, elforgatása -Comment[is]=Breyta stærð skjásins og snúa honum -Comment[it]=Ridimensiona e ruota il tuo display -Comment[ja]=ディスプレイのリサイズと回転 -Comment[ka]=ეკრანის ზომის და ორიენტაციის შეცვლა -Comment[kk]=Дисплейдің өлшемін және бағытын өзгерту -Comment[km]=ប្ដូរទំហំ និងបង្វិលការបង្ហាញរបស់អ្នក -Comment[ko]=디스플레이의 크기와 방향 조정 -Comment[lt]=Keisti ekrano dydį ir orientaciją -Comment[lv]=Maina izmēru un rotē Jūsu ekrānu -Comment[mk]=Сменете ја големината и ротацијата на вашиот екран -Comment[mn]=Дэлгэцийнхээ хэмжээг өөрчилөх ба эргүүлэх -Comment[ms]=Saiz Semula dan Putar paparan anda -Comment[mt]=Ibdel id-daqs jew dawwar l-iskrin -Comment[nb]=Endre størrelsen på og rotere skjermbildet -Comment[nds]=Grött un Utrichten vun den Schirm ännern -Comment[ne]=तपाईँको प्रदर्शन रिसाइज गर्नुहोस् र घुमाउनुहोस् -Comment[nl]=Wijzig de schermgrootte en roteer deze -Comment[nn]=Endra storleiken på og roter skjermbiletet -Comment[pa]=ਆਪਣੀ ਝਲਕ ਨੂੰ ਮੁੜ-ਆਕਾਰ ਕਰੋ ਤੇ ਘੁੰਮਾਓ -Comment[pl]=Zmiana rozmiaru i orientacji ekranu -Comment[pt]=Dimensione e rode o seu ecrã -Comment[pt_BR]=Redimensiona e Rotaciona a sua tela -Comment[ro]=Redimensionează și rotește ecranul dumneavoastră -Comment[ru]=Изменение размера и ориентации экрана -Comment[rw]=Guhindura ingano no Kuzengurutsa iyerekana ryawe -Comment[se]=Rievdat šearpma sturrodaga ja joraheami -Comment[sk]=Zmení veľkosť a otočí váš displej -Comment[sl]=Spremenite velikost in obrnite zaslon -Comment[sr]=Промените величину и оријентацију вашег екрана -Comment[sr@Latn]=Promenite veličinu i orijentaciju vašeg ekrana -Comment[sv]=Storleksändring och rotation av skärmen -Comment[ta]=தங்கள் காட்சியை அளவு மாற்று மற்றும் சுழற்று -Comment[tg]=Андозаи намоиши худро дигаргун созед ва чаппа кунед -Comment[th]=ปรับแต่งการแสดงผลของคุณ -Comment[tr]=Ekranı boyutlandır ve çevir -Comment[tt]=Kürägeñneñ Ülçäme belän Borılışı -Comment[uk]=Зміна розміру та обертання дисплею -Comment[uz]=Ekraning oʻlchamini oʻzgartirish va burish -Comment[uz@cyrillic]=Экранинг ўлчамини ўзгартириш ва буриш -Comment[vi]=Đổi cỡ và Quay màn hình của bạn -Comment[wa]=Candjî l' grandeu eyet tourner li håynaedje -Comment[zh_CN]=更改显示大小和旋转显示 -Comment[zh_TW]=調整大小及旋轉你的螢幕 Keywords=resize;rotate;display;color;depth;size;horizontal;vertical; -Keywords[ar]=تغيير حجم، تدوير، لف، عرض، لون، عمق، حجم، أفقي، عمودي; -Keywords[be]=Змена памеру;Перагортванне;Дысплей;Экран;Колер;Глыбіня;Памер;Гарызантальны;Вертыкальны;resize;rotate;display;color;depth;size;horizontal;vertical; -Keywords[bg]=ротация; завъртане; екран; размер; промяна; resize; rotate; display; color; depth; size; horizontal; vertical; -Keywords[bs]=resize;rotate;display;color;depth;size;horizontal;vertical;veličina;rotacija;ekran;boja;dubina;uspravno;vodoravno; -Keywords[ca]=amida;gira;pantalla;color;profunditat;mida;horitzontal;vertical; -Keywords[cs]=velikost;rotace;obrazovka;barva;hloubka;horizontální;vertikální; -Keywords[csb]=zjinaka miarë;òbrócenié;pòłożenié;miara;ekran;farwa;farwë;głãbòkòsc farwów;wielëna farwów;knôdno;hòrizontalno; -Keywords[cy]=newid maint;cylchdroi;dangos;lliw;dyfnder;maint;llorweddol;fertigol; -Keywords[da]=ændr;rotér;visning;farve;dybde;størrelse;vandret;lodret; -Keywords[de]=Größe ändern;rotieren;anzeigen;Farbe;Tiefe;Größe;horizontal;vertikal;waagrecht;senkrecht; -Keywords[el]=αλλαγή μεγέθους;περιστροφή;οθόνη;χρώμα;βάθος;μέγεθος;οριζόντια;κατακόρυφα; -Keywords[en_GB]=resize;rotate;display;colour;depth;size;horizontal;vertical; -Keywords[eo]=grandigi;turni;direkto;ekrano;ekranbloko;grandeco;koloro;horizontala;vertikala; -Keywords[es]=redimensionar;rotar;mostrar;color;colores;tamaño;horizontal;vertical; -Keywords[et]=suuruse muutmine;pööramine;monitor;ekraan;värv;sügavus;suurus;horisontaalne;vertikaalne; -Keywords[eu]=tamaina aldatu;biratu;pantaila;kolorea;sakonera;tamaina;horizontala; bertikala; -Keywords[fa]=تغییر اندازه، چرخش، نمایش، رنگ، عمق، اندازه، افقی، عمودی; -Keywords[fi]=vaihda kokoa;käännä;näyttö;väri;syvyys;koko;vaakasuora;pystysuora; -Keywords[fr]=redimensionner;rotation;affichage;couleur;profondeur;taille; horizontal;vertical; -Keywords[fy]=grutte wizigje;rotearje;draaie;display;byldskerm;skerm;monitor;djipte;grutte;horizontaal;vertikaal; -Keywords[ga]=athraigh méid;rothlaigh;scáileán;dath;doimhneacht;méid;cothrománach;ingearach; -Keywords[gl]=redimensionar;rotar;pantalla;cor;resolución;tamaño;horizontal;vertical; -Keywords[he]=שנה גודל;סובב;תצוגה;צבע;עומק;גודל;אופקי;אנכי; resize;rotate;display;color;depth;size;horizontal;vertical; -Keywords[hi]=नया-आकार;घुमाएँ;प्रकटन;रंग;गहराई;आकार;आड़ा;खड़ा; -Keywords[hr]=resize;rotate;display;color;depth;size;horizontal;vertical;promjena;veličina;rotacija;zaslon;boja;dubina;vodoravno;uspravno; -Keywords[hu]=átméretezés;elforgatás;képernyő;szín;színmélység;vízszintes;függőleges; -Keywords[is]=resize;rotate;display;color;depth;size;horizontal;vertical;stækka;minnka;snúa; -Keywords[it]=ridimensiona;ruota;schermo;colori;profondità di colore;dimensione;orizzontale;verticale; -Keywords[ja]=リサイズ;回転;ディスプレイ;色;深度;サイズ;水平;垂直; -Keywords[km]=ប្ដូរទំហំ;បង្វិល;បង្ហាញ;ពណ៌;ជម្រៅ;ទំហំ;ផ្ដេក;បញ្ឈរ; -Keywords[lt]=resize;rotate;display;color;depth;size;horizontal;vertical;keisti dydį;pasukti;sukti;ekranas;spalva;gylis;dydis;horizontalus;vertikalus; -Keywords[lv]=mainīt izmēru;rotēt;ekrāns;krāsa;dziļums;izmērs;horizontāls;vertikāls; -Keywords[mk]=resize;rotate;display;color;depth;size;horizontal;vertical;смени големина;ротира;прикажи;екран;боја;длабочина;големина;хоризонтално;вертикално; -Keywords[mn]=хэмжээ өөрчилөх;эргүүлэх;дэлгэц;өнгө;гүн;хэмжээ;хэвтээ;босоо; -Keywords[nb]=størrelse;rotere;skjerm;farge;dybde;vannrett;loddrett; -Keywords[nds]=Grött ännern;dreihen;display;Dorstellen;Klöör;Deep;Grött;waagrecht;pielliek; -Keywords[ne]=रिसाइज; घुमाउनुहोस्; प्रदर्शन; गहिराइ; साइज; तेर्सो; ठाडो; -Keywords[nl]=grootte wijzigen;roteren;draaien;display;beeldscherm;scherm;monitor;diepte;grootte;horizontaal;verticaal; -Keywords[nn]=storleik;rotera;skjerm;farge;djupn;vassrett;loddrett; -Keywords[pa]=ਮੁੜ-ਅਕਾਰ;ਘੁੰਮਾਉ;ਝਲਕ;ਰੰਗ;ਡੂੰਘਾਈ;ਅਕਾਰ;ਖਿਤਿਜੀ;ਲੰਬਕਾਰੀ; -Keywords[pl]=zmiana rozmiaru;obrót;orientacja;rozmiar;ekran;kolor;kolory;głębokość kolorów;liczba kolorów;pionowo;poziomo; -Keywords[pt]=redimensionar;rodar;ecrã;cor;profundidade;tamanho;horizontal;vertical; -Keywords[pt_BR]=redimensionar;rotacionar;display;cor;produndidade;tamanho;horizontal;vertical; -Keywords[ro]=redimensionare;rotire;ecran;monitor;culoare;adîncime;mărime;orizontal;vertical; -Keywords[ru]=resize;rotate;display;color;depth;size;horizontal;vertical;экран; -Keywords[rw]=guhindura ingano;kuzengurutsa;kwerekana;ibara;ubujyakuzimu;ingano;bitambitse;bihagaritse; -Keywords[se]=sturrodat;jorahit;šearbma;ivdni;čikŋodat;láskut;ceaggut; -Keywords[sk]=zmena veľkosti;rotácia;displej;farba;hĺbka;veľkosť;horizontálne;vertikálne; -Keywords[sl]=spremeni;velikost;zavrti;zaslon;barva;globina;navpičn;vodoravn; -Keywords[sr]=resize;rotate;display;color;depth;size;horizontal;vertical;промена;величина;ротација;екран;боја;дубина;водоравно;усправно; -Keywords[sr@Latn]=resize;rotate;display;color;depth;size;horizontal;vertical;promena;veličina;rotacija;ekran;boja;dubina;vodoravno;uspravno; -Keywords[sv]=ändra storlek;rotera;skärm;färg;djup;storlek;horisontell;vertikal; -Keywords[ta]=அளவுமாற்று; சுழற்று; காட்டு;வண்ணம்; ஆழம்;அளவு;இடவலம்;மேலிருந்து கீழ்; -Keywords[th]=ปรับขนาด;หมุน;จอภาพ;สี;ความลึก;ขนาด;แนวราบ;แนวดิ่ง; -Keywords[tr]=boyutlandır;çevir;görünüm;renk;derinlik;boyut;dikey;yatay; -Keywords[uk]=зміна розміру;розмір;обертання;дисплей;колір;глибина;горизонтальний;вертикальний; -Keywords[uz]=oʻlchamini oʻzgartirish;burish;ekran;rang;chuqurlik;oʻlcham;gorizantal;vertikal; -Keywords[uz@cyrillic]=ўлчамини ўзгартириш;буриш;экран;ранг;чуқурлик;ўлчам;горизантал;вертикал; -Keywords[vi]=đổi cỡ;quay;hiển thị;màu;độ sâu;cỡ;ngang;dọc; -Keywords[wa]=candjî l' grandeu;tourner;håynaedje;coleur;parfondeu;grandeu;di coûtchî;d' astampé; -Keywords[zh_CN]=resize;rotate;display;color;depth;size;horizontal;vertical;更改大小;旋转;显示;颜色;深度;大小;垂直;水平; -Keywords[zh_TW]=resize;rotate;display;color;depth;size;horizontal;vertical;調整大小;旋轉;螢幕;顏色;深度;尺寸;垂直;水平; diff --git a/kcontrol/randr/tderandrapp.cpp b/kcontrol/randr/tderandrapp.cpp index e2a4b46f2..a6d704e30 100644 --- a/kcontrol/randr/tderandrapp.cpp +++ b/kcontrol/randr/tderandrapp.cpp @@ -28,7 +28,7 @@ KRandRApp::KRandRApp() : m_tray(new KRandRSystemTray(0L, "RANDRTray")) { - connect(&m_eventMergingTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(handleX11ConfigChangeEvent())); + connect(&m_eventMergingTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(handleX11ConfigChangeEvent())); m_tray->show(); } @@ -41,7 +41,7 @@ void KRandRApp::handleX11ConfigChangeEvent() bool KRandRApp::x11EventFilter(XEvent* e) { if (e->type == m_tray->screenChangeNotifyEvent()) { - m_eventMergingTimer.start(1000, TRUE); + m_eventMergingTimer.start(1000, true); } return TDEApplication::x11EventFilter( e ); } diff --git a/kcontrol/randr/tderandrapp.h b/kcontrol/randr/tderandrapp.h index 004da6294..4a2856ad4 100644 --- a/kcontrol/randr/tderandrapp.h +++ b/kcontrol/randr/tderandrapp.h @@ -20,13 +20,13 @@ #define TDERANDRAPP_H #include <tqtimer.h> -#include <kuniqueapplication.h> +#include <tdeuniqueapplication.h> class KRandRSystemTray; -class KRandRApp : public KUniqueApplication +class KRandRApp : public TDEUniqueApplication { - Q_OBJECT + TQ_OBJECT public: KRandRApp(); diff --git a/kcontrol/randr/tderandrbindings.cpp b/kcontrol/randr/tderandrbindings.cpp index 07702633b..a5ad3fe6d 100644 --- a/kcontrol/randr/tderandrbindings.cpp +++ b/kcontrol/randr/tderandrbindings.cpp @@ -1,4 +1,3 @@ -// -*- Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 8; -*- /* This file is part of the KDE project Copyright (C) by Andrew Stanley-Jones @@ -19,7 +18,7 @@ */ #ifndef NOSLOTS # define DEF( name, key3, key4, fnSlot ) \ - keys->insert( name, i18n(name), TQString(), key3, key4, TQT_TQOBJECT(this), TQT_SLOT(fnSlot) ) + keys->insert( name, i18n(name), TQString(), key3, key4, this, TQ_SLOT(fnSlot) ) #else # define DEF( name, key3, key4, fnSlot ) \ keys->insert( name, i18n(name), TQString(), key3, key4 ) diff --git a/kcontrol/randr/tderandrmodule.cpp b/kcontrol/randr/tderandrmodule.cpp index 11263bbf4..b8a53ce89 100644 --- a/kcontrol/randr/tderandrmodule.cpp +++ b/kcontrol/randr/tderandrmodule.cpp @@ -48,12 +48,12 @@ K_EXPORT_COMPONENT_FACTORY (kcm_randr, KSSFactory("tderandr") ) extern "C" { - KDE_EXPORT void init_randr() + TDE_EXPORT void init_randr() { KRandRModule::performApplyOnStartup(); } - KDE_EXPORT bool test_randr() + TDE_EXPORT bool test_randr() { int eventBase, errorBase; if( XRRQueryExtension(tqt_xdisplay(), &eventBase, &errorBase ) ) @@ -100,7 +100,7 @@ KRandRModule::KRandRModule(TQWidget *parent, const char *name, const TQStringLis screenLabel->setBuddy( m_screenSelector ); TQWhatsThis::add(m_screenSelector, i18n("The screen whose settings you would like to change can be selected using this drop-down list.")); - connect(m_screenSelector, TQT_SIGNAL(activated(int)), TQT_SLOT(slotScreenChanged(int))); + connect(m_screenSelector, TQ_SIGNAL(activated(int)), TQ_SLOT(slotScreenChanged(int))); if (numScreens() <= 1) m_screenSelector->setEnabled(false); @@ -110,7 +110,7 @@ KRandRModule::KRandRModule(TQWidget *parent, const char *name, const TQStringLis TQLabel *sizeLabel = new TQLabel(i18n("Screen size:"), sizeBox); m_sizeCombo = new KComboBox(sizeBox); TQWhatsThis::add(m_sizeCombo, i18n("The size, otherwise known as the resolution, of your screen can be selected from this drop-down list.")); - connect(m_sizeCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSizeChanged(int))); + connect(m_sizeCombo, TQ_SIGNAL(activated(int)), TQ_SLOT(slotSizeChanged(int))); sizeLabel->setBuddy( m_sizeCombo ); TQHBox* refreshBox = new TQHBox(this); @@ -118,10 +118,10 @@ KRandRModule::KRandRModule(TQWidget *parent, const char *name, const TQStringLis TQLabel *rateLabel = new TQLabel(i18n("Refresh rate:"), refreshBox); m_refreshRates = new KComboBox(refreshBox); TQWhatsThis::add(m_refreshRates, i18n("The refresh rate of your screen can be selected from this drop-down list.")); - connect(m_refreshRates, TQT_SIGNAL(activated(int)), TQT_SLOT(slotRefreshChanged(int))); + connect(m_refreshRates, TQ_SIGNAL(activated(int)), TQ_SLOT(slotRefreshChanged(int))); rateLabel->setBuddy( m_refreshRates ); - m_rotationGroup = new TQButtonGroup(2, Qt::Horizontal, i18n("Orientation (degrees counterclockwise)"), this); + m_rotationGroup = new TQButtonGroup(2, TQt::Horizontal, i18n("Orientation (degrees counterclockwise)"), this); topLayout->addWidget(m_rotationGroup); m_rotationGroup->setRadioButtonExclusive(true); TQWhatsThis::add(m_rotationGroup, i18n("The options in this section allow you to change the rotation of your screen.")); @@ -129,14 +129,14 @@ KRandRModule::KRandRModule(TQWidget *parent, const char *name, const TQStringLis m_applyOnStartup = new TQCheckBox(i18n("Apply settings on TDE startup"), this); topLayout->addWidget(m_applyOnStartup); TQWhatsThis::add(m_applyOnStartup, i18n("If this option is enabled the size and orientation settings will be used when TDE starts.")); - connect(m_applyOnStartup, TQT_SIGNAL(clicked()), TQT_SLOT(setChanged())); + connect(m_applyOnStartup, TQ_SIGNAL(clicked()), TQ_SLOT(setChanged())); TQHBox* syncBox = new TQHBox(this); syncBox->layout()->addItem(new TQSpacerItem(20, 1, TQSizePolicy::Maximum)); m_syncTrayApp = new TQCheckBox(i18n("Allow tray application to change startup settings"), syncBox); topLayout->addWidget(syncBox); TQWhatsThis::add(m_syncTrayApp, i18n("If this option is enabled, options set by the system tray applet will be saved and loaded when TDE starts instead of being temporary.")); - connect(m_syncTrayApp, TQT_SIGNAL(clicked()), TQT_SLOT(setChanged())); + connect(m_syncTrayApp, TQ_SIGNAL(clicked()), TQ_SLOT(setChanged())); topLayout->addStretch(1); @@ -155,11 +155,11 @@ void KRandRModule::addRotationButton(int thisRotation, bool checkbox) if (!checkbox) { TQRadioButton* thisButton = new TQRadioButton(RandRScreen::rotationName(thisRotation), m_rotationGroup); thisButton->setEnabled(thisRotation & currentScreen()->rotations()); - connect(thisButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotRotationChanged())); + connect(thisButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotRotationChanged())); } else { TQCheckBox* thisButton = new TQCheckBox(RandRScreen::rotationName(thisRotation), m_rotationGroup); thisButton->setEnabled(thisRotation & currentScreen()->rotations()); - connect(thisButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotRotationChanged())); + connect(thisButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotRotationChanged())); } } diff --git a/kcontrol/randr/tderandrmodule.h b/kcontrol/randr/tderandrmodule.h index 65131ee26..73a13b623 100644 --- a/kcontrol/randr/tderandrmodule.h +++ b/kcontrol/randr/tderandrmodule.h @@ -27,7 +27,7 @@ class TQCheckBox; class KRandRModule : public TDECModule, public KRandrSimpleAPI { - Q_OBJECT + TQ_OBJECT public: KRandRModule(TQWidget *parent, const char *name, const TQStringList& _args); diff --git a/kcontrol/randr/tderandrpassivepopup.cpp b/kcontrol/randr/tderandrpassivepopup.cpp index 5d2010f94..8dad337b7 100644 --- a/kcontrol/randr/tderandrpassivepopup.cpp +++ b/kcontrol/randr/tderandrpassivepopup.cpp @@ -28,7 +28,7 @@ KRandrPassivePopup::KRandrPassivePopup( TQWidget *parent, const char *name, WFlags f ) : KPassivePopup( parent, name, f ) { - connect( &update_timer, TQT_SIGNAL( timeout()), TQT_SLOT( slotPositionSelf())); + connect( &update_timer, TQ_SIGNAL( timeout()), TQ_SLOT( slotPositionSelf())); } KRandrPassivePopup* KRandrPassivePopup::message( const TQString &caption, const TQString &text, @@ -88,14 +88,14 @@ void KRandrPassivePopup::startWatchingWidget( TQWidget* widget_P ) } } if( x11_events ) - kapp->installX11EventFilter( this ); + tdeApp->installX11EventFilter( this ); } bool KRandrPassivePopup::eventFilter( TQObject* o, TQEvent* e ) { if( e->type() == TQEvent::Move && o->isWidgetType() - && watched_widgets.contains( TQT_TQWIDGET( o ))) - TQTimer::singleShot( 0, this, TQT_SLOT( slotPositionSelf())); + && watched_widgets.contains( static_cast<TQWidget*>( o ))) + TQTimer::singleShot( 0, this, TQ_SLOT( slotPositionSelf())); return false; } diff --git a/kcontrol/randr/tderandrpassivepopup.h b/kcontrol/randr/tderandrpassivepopup.h index 3b1d4b4f6..87dac8c0d 100644 --- a/kcontrol/randr/tderandrpassivepopup.h +++ b/kcontrol/randr/tderandrpassivepopup.h @@ -27,7 +27,7 @@ class KRandrPassivePopup : public KPassivePopup { - Q_OBJECT + TQ_OBJECT public: static KRandrPassivePopup *message( const TQString &caption, const TQString &text, const TQPixmap &icon, TQWidget *parent, const char *name=0, int timeout = -1 ); diff --git a/kcontrol/randr/tderandrtray-autostart.desktop b/kcontrol/randr/tderandrtray-autostart.desktop index 30a36f7b9..c622d7c28 100644 --- a/kcontrol/randr/tderandrtray-autostart.desktop +++ b/kcontrol/randr/tderandrtray-autostart.desktop @@ -2,134 +2,8 @@ Name=TDERandRTray GenericName=Screen Resize & Rotate -GenericName[af]=Skerm Hervergroot & Roteer -GenericName[be]=Змена памераў экрана і перагортванне -GenericName[bg]=Размер и ротация на екрана -GenericName[bn]=পর্দা মাপবদল ও আবর্তন -GenericName[br]=Adventañ ha treiñ ar skramm -GenericName[bs]=Veličina i rotacija ekrana -GenericName[ca]=Amida i gira la pantalla -GenericName[cs]=Změna velikosti a rotace obrazovky -GenericName[csb]=Òbrócenié ë zjinaka miarë ekranu -GenericName[cy]=Newid Maint a Cylchdroi'r Sgrîn -GenericName[da]=Ændr størrelse på skærm & Rotér -GenericName[de]=Bildschirmgröße & -ausrichtung ändern -GenericName[el]=Αλλαγή μεγέθους & Περιστροφή οθόνης -GenericName[eo]=Regrandigi kaj Turni Ekranon -GenericName[es]=Redimensionar y rotar pantalla -GenericName[et]=Ekraani suuruse muutmine ja pööramine -GenericName[eu]=Pantailaren tamaina aldaketa eta biraketa -GenericName[fa]=تغییر اندازه و چرخش پرده -GenericName[fi]=Näytön kuvan koon muuttaminen ja kuvan kääntäminen -GenericName[fr]=Redimensionnement et rotation de l'écran -GenericName[fy]=Skerm rotearje en grutte wizigje -GenericName[gl]=Rotación e Redimensionamento da Pantallla -GenericName[he]=שינוי גודל המסך וסיבובו -GenericName[hr]=Veličine i orijentacija zaslona -GenericName[hu]=Képernyőbeállító -GenericName[is]=Stærð og snúningur skjáa -GenericName[it]=Ruota e ridimensiona lo schermo -GenericName[ja]=スクリーンのリサイズと回転 -GenericName[ka]=ეკრანის ზომა და ორიენტაცია -GenericName[kk]=Экранды өзгерту және бұрау -GenericName[km]=ប្ដូរទំហំ & បង្វិលអេក្រង់ -GenericName[ko]=화면 크기 조정 및 회전 -GenericName[lt]=Ekrano dydžio keitimas ir pasukimas -GenericName[mk]=Големина и ротација на екранот -GenericName[ms]=Saiz Semula Skrin & Putar -GenericName[nb]=Endre størrelsen på og rotere skjermbildet -GenericName[nds]=Schirmgrött un -utrichten ännern -GenericName[ne]=पर्दा रिसाइज र परिक्रमण -GenericName[nl]=Scherm roteren en grootte wijzigen -GenericName[nn]=Endra storleiken på og roter skjermbiletet -GenericName[pa]=ਪਰਦਾ ਮੁੜ ਆਕਾਰ ਤੇ ਘੁੰਮਾਓ -GenericName[pl]=Obrót i zmiana rozmiaru ekranu -GenericName[pt]=Mudar o Tamanho e Rodar o Ecrã -GenericName[pt_BR]=Redimensionar Tela & Rotacionar -GenericName[ro]=Redimensionare și rotire ecran -GenericName[ru]=Изменение размера и ориентации экрана -GenericName[rw]=Kuhindura ingano & Kuzengurutsa Mugaragaza -GenericName[se]=Rievdat šearbmagova sturrodaga ja jorat dan -GenericName[sk]=Zmena veľkosti a otočenia obrazovky -GenericName[sl]=Spreminjanje velikosti in obračanje zaslona -GenericName[sr]=Промена величине и ротација екрана -GenericName[sr@Latn]=Promena veličine i rotacija ekrana -GenericName[sv]=Ändra skärmstorlek och rotera -GenericName[ta]=திரை அளவு மாற்று & சுழற்று -GenericName[tg]=Ивази андоза ва мавқеи экран -GenericName[th]=ปรับขนาดและหมุนหน้าจอ -GenericName[tr]=Ekran Boyutlandır ve Döndür -GenericName[tt]=Küräk Ülçäme & Borılışı -GenericName[uk]=Зміна розміру та обертання екрана -GenericName[uz]=Ekraning oʻlchamini oʻzgartirish va burish -GenericName[uz@cyrillic]=Экранинг ўлчамини ўзгартириш ва буриш -GenericName[vi]=Thay đổi cỡ màn hình & Quay -GenericName[wa]=Candjî l' grandeu del waitroûle eyet l' tourner -GenericName[zh_CN]=屏幕大小和旋转 -GenericName[zh_TW]=螢幕調整大小及旋轉 Comment=Resize and rotate X screens. -Comment[af]=Hervergroot en roteer X skerms. -Comment[ar]=غيير القياس و الدوران للشاشات X. -Comment[be]=Змена памераў і перагортванне экранаў X. -Comment[bg]=Размер и ротация на екрана. -Comment[bn]=আপনার এক্স-স্ক্রীণ-এর আকৃতি এবং দিশা পরিবর্তন করুন -Comment[br]=Adventañ ha treiñ ho diskweloù X. -Comment[bs]=Podesite veličinu i rotirajte vaš ekran. -Comment[ca]=Gira i amida les pantalles X. -Comment[cs]=Změna velikosti a rotace obrazovky. -Comment[csb]=Zjinaka miarë ë pòłożenia ekranów. -Comment[da]=Ændrer størrelse og roterer X-skærme -Comment[de]=Größe und Ausrichtung der Anzeige ändern -Comment[el]=Αλλαγή μεγέθους και περιστροφή της οθόνης. -Comment[eo]=Regrandigi kaj turni X ekranojn. -Comment[es]=Ajustar el tamaño y rotar las pantallas X. -Comment[et]=X'i ekraani muutmine ja pööramine -Comment[eu]=Aldatu tamaina eta biratu zure X pantailak. -Comment[fa]=تغییر اندازه و چرخش پردههای X. -Comment[fi]=Näytön kuvan koon muuttaminen ja kuvan kääntäminen -Comment[fr]=Redimensionner et retourner votre affichage. -Comment[fy]=Skermgrutte wizigje en rotearje X skermen -Comment[ga]=Athraigh an méid agus rothlaigh scáileáin X. -Comment[gl]=Redimensionar e rotar pantallas -Comment[he]=שנה את גודלה של התצוגה שלך וסובב אותה. -Comment[hr]=Promjena veličine i orijentacije X zaslona -Comment[hu]=A képernyő átméretezése, elforgatása -Comment[is]=Breyta stærð skjásins og snúa honum. -Comment[it]=Ridimensiona e ruota gli schermi di X. -Comment[ja]=X スクリーンのリサイズと回転。 -Comment[ka]=ეკრანის ზომის და ორიენტაციის შეცვლა -Comment[kk]=Экранның өлшемін және бағытын өзгерту -Comment[km]=ប្ដូរទំហំ និងបង្វិលអេក្រង់ X ។ -Comment[lt]=Keisti X ekrano dydį ir orientaciją. -Comment[mk]=Сменете ја големината и ротацијата на вашиот екран -Comment[nb]=Endrer størrelsen på og roterer X-skjermbildet -Comment[nds]=Grött un Utrichten vun den X-Schirm ännern -Comment[ne]=X पर्दा रिसाइज गर्नुहोस् र घुमाउनुहोस् -Comment[nl]=Scherm roteren en van grootte veranderen -Comment[nn]=Endra storleiken på og roter X-skjermbiletet. -Comment[pa]=X ਸਕਰੀਨ ਨੂੰ ਮੁੜ-ਅਕਾਰ ਅਤੇ ਘੁੰਮਾਓ। -Comment[pl]=Zmiana rozmiaru i orientacji ekranów. -Comment[pt]=Mudar o tamanho e rodar os ecrãs do X. -Comment[pt_BR]=Redimensiona e rotaciona as tela do X. -Comment[ro]=Redimensionează și rotește ecranele X. -Comment[ru]=Изменение размера и ориентации экранов X. -Comment[se]=Rievdat X-šearpmaid sturrodaga ja joraheami. -Comment[sk]=Zmení veľkosť a otočí obrazovky -Comment[sl]=Spremenite velikost in obrnite zaslon. -Comment[sr]=Промените величину и оријентацију екрана -Comment[sr@Latn]=Promenite veličinu i orijentaciju ekrana -Comment[sv]=Storleksändring och rotation av X-skärmar. -Comment[tg]=Ивази андоза ва мавқеи экранҳои Х. -Comment[th]=ปรับแต่งการแสดงผลของ X -Comment[tr]=Ekranı boyutlandır ve çevir. -Comment[uk]=Зміна розміру та обертання екранів X. -Comment[uz]=Ekraning oʻlchamini oʻzgartirish va burish -Comment[uz@cyrillic]=Экранинг ўлчамини ўзгартириш ва буриш -Comment[vi]=Đổi cỡ và quay màn hình X. -Comment[wa]=Candjî l' grandeu eyet tourner les waitroûles X. -Comment[zh_CN]=更改 X 屏幕的大小和旋转。 -Comment[zh_TW]=調整大小及旋轉 X 螢幕。 Exec=tderandrtray Icon=randr diff --git a/kcontrol/randr/tderandrtray.cpp b/kcontrol/randr/tderandrtray.cpp index a443c3781..0506639e3 100644 --- a/kcontrol/randr/tderandrtray.cpp +++ b/kcontrol/randr/tderandrtray.cpp @@ -16,6 +16,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include <tqtimer.h> #include <tqimage.h> #include <tqtooltip.h> @@ -32,7 +36,7 @@ #include <kstdguiitem.h> #include <tdeglobal.h> #include <tdemessagebox.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <cstdlib> #include <unistd.h> @@ -55,15 +59,15 @@ KRandRSystemTray::KRandRSystemTray(TQWidget* parent, const char *name) , m_help(new KHelpMenu(this, TDEGlobal::instance()->aboutData(), false, actionCollection())) { TDEPopupMenu *help = m_help->menu(); - help->connectItem(KHelpMenu::menuHelpContents, this, TQT_SLOT(slotHelpContents())); + help->connectItem(KHelpMenu::menuHelpContents, this, TQ_SLOT(slotHelpContents())); setPixmap(KSystemTray::loadIcon("randr")); - setAlignment(Qt::AlignHCenter | Qt::AlignVCenter); - connect(this, TQT_SIGNAL(quitSelected()), this, TQT_SLOT(_quit())); + setAlignment(TQt::AlignHCenter | TQt::AlignVCenter); + connect(this, TQ_SIGNAL(quitSelected()), this, TQ_SLOT(_quit())); TQToolTip::add(this, i18n("Screen resize & rotate")); my_parent = parent; //printf("Reading configuration...\n"); - globalKeys = new TDEGlobalAccel(TQT_TQOBJECT(this)); + globalKeys = new TDEGlobalAccel(this); TDEGlobalAccel* keys = globalKeys; #include "tderandrbindings.cpp" // the keys need to be read from kdeglobals, not kickerrc @@ -71,10 +75,10 @@ KRandRSystemTray::KRandRSystemTray(TQWidget* parent, const char *name) globalKeys->setEnabled(true); globalKeys->updateConnections(); - connect(kapp, TQT_SIGNAL(settingsChanged(int)), TQT_SLOT(slotSettingsChanged(int))); + connect(tdeApp, TQ_SIGNAL(settingsChanged(int)), TQ_SLOT(slotSettingsChanged(int))); #if (TQT_VERSION-0 >= 0x030200) // XRANDR support -// connect(this, TQT_SIGNAL(screenSizeChanged(int, int)), kapp->desktop(), TQT_SLOT( desktopResized())); +// connect(this, TQ_SIGNAL(screenSizeChanged(int, int)), tdeApp->desktop(), TQ_SLOT( desktopResized())); #endif randr_display = XOpenDisplay(NULL); @@ -84,7 +88,7 @@ KRandRSystemTray::KRandRSystemTray(TQWidget* parent, const char *name) last_known_y = currentScreen()->currentPixelHeight(); } - t_config = new KSimpleConfig("kiccconfigrc"); + t_config = new TDESimpleConfig("kiccconfigrc"); TQString cur_profile; cur_profile = getCurrentProfile(); @@ -92,19 +96,19 @@ KRandRSystemTray::KRandRSystemTray(TQWidget* parent, const char *name) applyIccConfiguration(cur_profile, NULL); } -#ifdef __TDE_HAVE_TDEHWLIB +#ifdef WITH_TDEHWLIB TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); - connect(hwdevices, TQT_SIGNAL(hardwareUpdated(TDEGenericDevice*)), this, TQT_SLOT(deviceChanged(TDEGenericDevice*))); + connect(hwdevices, TQ_SIGNAL(hardwareUpdated(TDEGenericDevice*)), this, TQ_SLOT(deviceChanged(TDEGenericDevice*))); #endif } /*! - * \b TQT_SLOT which called if tderandrtray is exited by the user. In this case the user + * \b TQ_SLOT which called if tderandrtray is exited by the user. In this case the user * is asked through a yes/no box if "KRandRTray should start automatically on log in" and the * result is written to the KDE configfile. */ void KRandRSystemTray::_quit (){ - r_config = new KSimpleConfig("tderandrtrayrc"); + r_config = new TDESimpleConfig("tderandrtrayrc"); TQString tmp1 = i18n ("Start KRandRTray automatically when you log in?"); int tmp2 = KMessageBox::questionYesNo ( 0, tmp1, i18n("Question"), i18n("Start Automatically"), i18n("Do Not Start")); @@ -143,7 +147,7 @@ void KRandRSystemTray::showEvent ( TQShowEvent * ) void KRandRSystemTray::mousePressEvent(TQMouseEvent* e) { // Popup the context menu with left-click - if (e->button() == Qt::LeftButton) { + if (e->button() == TQt::LeftButton) { contextMenuAboutToShow(contextMenu()); contextMenu()->popup(e->globalPos()); e->accept(); @@ -191,15 +195,15 @@ void KRandRSystemTray::reloadDisplayConfiguration() if (RR_Disconnected == randr_screen_info->outputs[i]->info->connection) { continue; } - + // Activate this output randr_screen_info->cur_crtc = randr_screen_info->outputs[i]->cur_crtc; randr_screen_info->cur_output = randr_screen_info->outputs[i]; randr_screen_info->cur_output->auto_set = 1; randr_screen_info->cur_output->off_set = 0; output_auto (randr_screen_info, randr_screen_info->cur_output); - i=main_low_apply(randr_screen_info); - + main_low_apply(randr_screen_info); + if (randr_screen_info->outputs[i]->cur_crtc) { // Output successfully activated! set_primary_output(randr_screen_info, randr_screen_info->cur_output->id); @@ -249,25 +253,28 @@ void KRandRSystemTray::contextMenuAboutToShow(TDEPopupMenu* menu) menu->setCheckable(true); bool valid = isValid(); - - if (!valid) { + if (!valid) + { lastIndex = menu->insertItem(i18n("Required X Extension Not Available")); menu->setItemEnabled(lastIndex, false); - } - else { + else + { m_screenPopups.clear(); - for (int s = 0; s < numScreens() /*&& numScreens() > 1 */; s++) { - setCurrentScreen(s); - if (s == screenIndexOfWidget(this)) { - /*lastIndex = menu->insertItem(i18n("Screen %1").arg(s+1)); - menu->setItemEnabled(lastIndex, false);*/ - } else { - TDEPopupMenu* subMenu = new TDEPopupMenu(menu, TQString("screen%1").arg(s+1).latin1()); - m_screenPopups.append(subMenu); - populateMenu(subMenu); - lastIndex = menu->insertItem(i18n("Screen %1").arg(s+1), subMenu); - connect(subMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(slotScreenActivated())); + if (numScreens() > 1) + { + int screenOfWidget = screenIndexOfWidget(this); + for (int s = 0; s < numScreens(); s++) + { + setCurrentScreen(s); + if (s != screenOfWidget) + { + TDEPopupMenu *subMenu = new TDEPopupMenu(menu, TQString("screen%1").arg(s+1).latin1()); + m_screenPopups.append(subMenu); + populateMenu(subMenu); + lastIndex = menu->insertItem(i18n("Screen %1").arg(s+1), subMenu); + connect(subMenu, TQ_SIGNAL(activated(int)), TQ_SLOT(slotScreenActivated())); + } } } @@ -278,52 +285,52 @@ void KRandRSystemTray::contextMenuAboutToShow(TDEPopupMenu* menu) addOutputMenu(menu); // Find any user ICC profiles - TQStringList cfgProfiles; - cfgProfiles = t_config->groupList(); - if (cfgProfiles.isEmpty() == false) { - menu->insertTitle(SmallIcon("kcoloredit"), i18n("Color Profile")); - } - for (TQStringList::Iterator t(cfgProfiles.begin()); t != cfgProfiles.end(); ++t) { - lastIndex = menu->insertItem(*t); - if (t_config->readEntry("CurrentProfile") == (*t)) { - menu->setItemChecked(lastIndex, true); + TQStringList cfgProfiles = t_config->groupList(); + if (!cfgProfiles.isEmpty()) + { + TDEPopupMenu *profileMenu = new TDEPopupMenu(menu); + for (TQStringList::Iterator t(cfgProfiles.begin()); t != cfgProfiles.end(); ++t) + { + lastIndex = profileMenu->insertItem(*t); + if (t_config->readEntry("CurrentProfile") == (*t)) + { + profileMenu->setItemChecked(lastIndex, true); + } + profileMenu->setItemEnabled(lastIndex, t_config->readBoolEntry("EnableICC", false)); + profileMenu->connectItem(lastIndex, this, TQ_SLOT(slotColorProfileChanged(int))); } - menu->setItemEnabled(lastIndex, t_config->readBoolEntry("EnableICC", false)); - menu->connectItem(lastIndex, this, TQT_SLOT(slotColorProfileChanged(int))); + menu->insertItem(SmallIcon("kcoloredit"), i18n("Color Profile"), profileMenu); } - if (valid) { + if (valid) + { // Find any display profiles - TQStringList displayProfiles; - displayProfiles = getDisplayConfigurationProfiles(locateLocal("config", "/", true)); - if (!displayProfiles.isEmpty()) { - menu->insertTitle(SmallIcon("background"), i18n("Display Profiles")); - lastIndex = menu->insertItem(SmallIcon("bookmark"), "<default>"); - menu->connectItem(lastIndex, this, TQT_SLOT(slotDisplayProfileChanged(int))); - for (TQStringList::Iterator t(displayProfiles.begin()); t != displayProfiles.end(); ++t) { - lastIndex = menu->insertItem(SmallIcon("bookmark"), *t); - menu->connectItem(lastIndex, this, TQT_SLOT(slotDisplayProfileChanged(int))); + TQStringList displayProfiles = getDisplayConfigurationProfiles(locateLocal("config", "/", true)); + if (!displayProfiles.isEmpty()) + { + TDEPopupMenu *displayProfileMenu = new TDEPopupMenu(menu); + lastIndex = displayProfileMenu->insertItem(SmallIcon("bookmark"), "<default>"); + displayProfileMenu->connectItem(lastIndex, this, TQ_SLOT(slotDisplayProfileChanged(int))); + for (TQStringList::Iterator t(displayProfiles.begin()); t != displayProfiles.end(); ++t) + { + lastIndex = displayProfileMenu->insertItem(SmallIcon("bookmark"), *t); + displayProfileMenu->connectItem(lastIndex, this, TQ_SLOT(slotDisplayProfileChanged(int))); } + menu->insertItem(SmallIcon("background"), i18n("Display Profiles"), displayProfileMenu); } } - menu->insertTitle(SmallIcon("randr"), i18n("Global Configuration")); - - TDEAction *actColors = new TDEAction( i18n( "Configure Displays..." ), - SmallIconSet( "configure" ), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT( slotDisplayConfig() ), - actionCollection() ); - actColors->plug( menu ); - -// TDEAction *actPrefs = new TDEAction( i18n( "Configure Display..." ), -// SmallIconSet( "configure" ), TDEShortcut(), this, TQT_SLOT( slotPrefs() ), -// actionCollection() ); -// actPrefs->plug( menu ); - - TDEAction *actSKeys = new TDEAction( i18n( "Configure Shortcut Keys..." ), - SmallIconSet( "configure" ), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT( slotSKeys() ), - actionCollection() ); - actSKeys->plug( menu ); + // Config menu + TDEPopupMenu *configMenu = new TDEPopupMenu(menu); + TDEAction *actColors = new TDEAction(i18n("Configure Displays..."), SmallIconSet("configure"), + TDEShortcut(), this, TQ_SLOT(slotDisplayConfig()), actionCollection()); + actColors->plug(configMenu); + TDEAction *actSKeys = new TDEAction(i18n("Configure Shortcut Keys..."), SmallIconSet("configure"), + TDEShortcut(), this, TQ_SLOT(slotSKeys()), actionCollection()); + actSKeys->plug(configMenu); + menu->insertItem(SmallIcon("randr"), i18n("Global Configuration"), configMenu); + menu->insertSeparator(); menu->insertItem(SmallIcon("help"),KStdGuiItem::help().text(), m_help->menu()); TDEAction *quitAction = actionCollection()->action(KStdAction::name(KStdAction::Quit)); quitAction->plug(menu); @@ -407,74 +414,85 @@ int KRandRSystemTray::GetHackResolutionParameter() { return resparm; } -void KRandRSystemTray::populateMenu(TDEPopupMenu* menu) +void KRandRSystemTray::populateMenu(TDEPopupMenu *menu) { - int lastIndex = 0; - - menu->insertTitle(SmallIcon("view-fullscreen"), i18n("Screen Size")); + int lastIndex; int numSizes = currentScreen()->numSizes(); - int* sizeSort = new int[numSizes]; - - for (int i = 0; i < numSizes; i++) { + int *sizeSort = new int[numSizes]; + for (int i = 0; i < numSizes; i++) + { sizeSort[i] = currentScreen()->pixelCount(i); } - for (int j = 0; j < numSizes; j++) { - int highest = -1, highestIndex = -1; - - for (int i = 0; i < numSizes; i++) { - if (sizeSort[i] && sizeSort[i] > highest) { + TDEPopupMenu *screenSizeMenu = new TDEPopupMenu(menu); + for (int j = 0; j < numSizes; j++) + { + int highest = 0, highestIndex = -1; + for (int i = 0; i < numSizes; i++) + { + if (sizeSort[i] > highest) + { highest = sizeSort[i]; highestIndex = i; } } - sizeSort[highestIndex] = -1; Q_ASSERT(highestIndex != -1); + sizeSort[highestIndex] = 0; - lastIndex = menu->insertItem(i18n("%1 x %2").arg(currentScreen()->pixelSize(highestIndex).width()).arg(currentScreen()->pixelSize(highestIndex).height())); - + lastIndex = screenSizeMenu->insertItem(i18n("%1 x %2").arg(currentScreen()->pixelSize(highestIndex).width()).arg(currentScreen()->pixelSize(highestIndex).height())); if (currentScreen()->proposedSize() == highestIndex) - menu->setItemChecked(lastIndex, true); + { + screenSizeMenu->setItemChecked(lastIndex, true); + } - menu->setItemParameter(lastIndex, highestIndex); - menu->connectItem(lastIndex, this, TQT_SLOT(slotResolutionChanged(int))); + screenSizeMenu->setItemParameter(lastIndex, highestIndex); + screenSizeMenu->connectItem(lastIndex, this, TQ_SLOT(slotResolutionChanged(int))); } delete [] sizeSort; - sizeSort = 0L; + sizeSort = nullptr; + + menu->insertItem(SmallIcon("view-fullscreen"), i18n("Screen Size"), screenSizeMenu); // Don't display the rotation options if there is no point (ie. none are supported) // XFree86 4.3 does not include rotation support. - if (currentScreen()->rotations() != RandRScreen::Rotate0) { - menu->insertTitle(SmallIcon("reload"), i18n("Orientation")); - - for (int i = 0; i < 6; i++) { - if ((1 << i) & currentScreen()->rotations()) { - lastIndex = menu->insertItem(currentScreen()->rotationIcon(1 << i), RandRScreen::rotationName(1 << i)); - + if (currentScreen()->rotations() != RandRScreen::Rotate0) + { + TDEPopupMenu *orientationMenu = new TDEPopupMenu(menu); + for (int i = 0; i < 6; i++) + { + if ((1 << i) & currentScreen()->rotations()) + { + lastIndex = orientationMenu->insertItem(currentScreen()->rotationIcon(1 << i), RandRScreen::rotationName(1 << i)); if (currentScreen()->proposedRotation() & (1 << i)) - menu->setItemChecked(lastIndex, true); + { + orientationMenu->setItemChecked(lastIndex, true); + } - menu->setItemParameter(lastIndex, 1 << i); - menu->connectItem(lastIndex, this, TQT_SLOT(slotOrientationChanged(int))); + orientationMenu->setItemParameter(lastIndex, 1 << i); + orientationMenu->connectItem(lastIndex, this, TQ_SLOT(slotOrientationChanged(int))); } } + menu->insertItem(SmallIcon("reload"), i18n("Orientation"), orientationMenu); } TQStringList rr = currentScreen()->refreshRates(currentScreen()->proposedSize()); - if (rr.count()) - menu->insertTitle(SmallIcon("clock"), i18n("Refresh Rate")); - - int i = 0; - for (TQStringList::Iterator it = rr.begin(); it != rr.end(); ++it, i++) { - lastIndex = menu->insertItem(*it); - - if (currentScreen()->proposedRefreshRate() == i) - menu->setItemChecked(lastIndex, true); + { + TDEPopupMenu *refreshRatesMenu = new TDEPopupMenu(menu); + int i = 0; + for (TQStringList::Iterator it = rr.begin(); it != rr.end(); ++it, i++) + { + lastIndex = refreshRatesMenu->insertItem(*it); + if (currentScreen()->proposedRefreshRate() == i) + { + refreshRatesMenu->setItemChecked(lastIndex, true); + } - menu->setItemParameter(lastIndex, i); - menu->connectItem(lastIndex, this, TQT_SLOT(slotRefreshRateChanged(int))); + refreshRatesMenu->setItemParameter(lastIndex, i); + refreshRatesMenu->connectItem(lastIndex, this, TQ_SLOT(slotRefreshRateChanged(int))); + } + menu->insertItem(SmallIcon("clock"), i18n("Refresh Rate"), refreshRatesMenu); } } @@ -734,86 +752,89 @@ void KRandRSystemTray::findPrimaryDisplay() } } -void KRandRSystemTray::addOutputMenu(TDEPopupMenu* menu) +void KRandRSystemTray::addOutputMenu(TDEPopupMenu *menu) { XRROutputInfo *output_info; char *output_name; - int i; int lastIndex = 0; int connected_displays = 0; - if (isValid() == true) { - menu->insertTitle(SmallIcon("kcmkwm"), i18n("Output Port")); + if (isValid()) + { + TDEPopupMenu *outputMenu = new TDEPopupMenu(menu); - for (i = 0; i < randr_screen_info->n_output; i++) { + // Look for active (i.e. switched on) outputs + for (int i = 0; i < randr_screen_info->n_output; i++) + { output_info = randr_screen_info->outputs[i]->info; - // Look for ON outputs - if (!randr_screen_info->outputs[i]->cur_crtc) { + if (!randr_screen_info->outputs[i]->cur_crtc) + { continue; } - if (RR_Disconnected == randr_screen_info->outputs[i]->info->connection) { + if (RR_Disconnected == randr_screen_info->outputs[i]->info->connection) + { continue; } output_name = output_info->name; - //printf("ON: Found output %s\n", output_name); - - lastIndex = menu->insertItem(i18n("%1 (Active)").arg(output_name)); - menu->setItemChecked(lastIndex, true); - menu->connectItem(lastIndex, this, TQT_SLOT(slotOutputChanged(int))); - menu->setItemParameter(lastIndex, i); + lastIndex = outputMenu->insertItem(i18n("%1 (Active)").arg(output_name)); + outputMenu->setItemChecked(lastIndex, true); + outputMenu->connectItem(lastIndex, this, TQ_SLOT(slotOutputChanged(int))); + outputMenu->setItemParameter(lastIndex, i); connected_displays++; } - for (i = 0; i < randr_screen_info->n_output; i++) { + // Look for inactive (i.e. switched off) but connected outputs + for (int i = 0; i < randr_screen_info->n_output; i++) + { output_info = randr_screen_info->outputs[i]->info; - // Look for CONNECTED outputs.... - if (RR_Disconnected == randr_screen_info->outputs[i]->info->connection) { + if (RR_Disconnected == randr_screen_info->outputs[i]->info->connection) + { continue; } - // ...that are not ON - if (randr_screen_info->outputs[i]->cur_crtc) { + if (randr_screen_info->outputs[i]->cur_crtc) + { continue; } output_name = output_info->name; - //printf("CONNECTED, NOT ON: Found output %s\n", output_name); - - lastIndex = menu->insertItem(i18n("%1 (Connected, Inactive)").arg(output_name)); - menu->setItemChecked(lastIndex, false); - menu->connectItem(lastIndex, this, TQT_SLOT(slotOutputChanged(int))); - menu->setItemParameter(lastIndex, i); + lastIndex = outputMenu->insertItem(i18n("%1 (Connected, Inactive)").arg(output_name)); + outputMenu->setItemChecked(lastIndex, false); + outputMenu->connectItem(lastIndex, this, TQ_SLOT(slotOutputChanged(int))); + outputMenu->setItemParameter(lastIndex, i); connected_displays++; } - for (i = 0; i < randr_screen_info->n_output; i++) { + // Look for all outputs that are not connected + for (int i = 0; i < randr_screen_info->n_output; i++) + { output_info = randr_screen_info->outputs[i]->info; - // Look for ALL outputs that are not connected.... - if (RR_Disconnected != randr_screen_info->outputs[i]->info->connection) { + if (RR_Disconnected != randr_screen_info->outputs[i]->info->connection) + { continue; } - // ...or ON - if (randr_screen_info->outputs[i]->cur_crtc) { + if (randr_screen_info->outputs[i]->cur_crtc) + { continue; } output_name = output_info->name; - //printf("DISCONNECTED, NOT ON: Found output %s\n", output_name); - - lastIndex = menu->insertItem(i18n("%1 (Disconnected, Inactive)").arg(output_name)); - menu->setItemChecked(lastIndex, false); - menu->setItemEnabled(lastIndex, false); - menu->connectItem(lastIndex, this, TQT_SLOT(slotOutputChanged(int))); - menu->setItemParameter(lastIndex, i); + lastIndex = outputMenu->insertItem(i18n("%1 (Disconnected, Inactive)").arg(output_name)); + outputMenu->setItemChecked(lastIndex, false); + outputMenu->setItemEnabled(lastIndex, false); + outputMenu->connectItem(lastIndex, this, TQ_SLOT(slotOutputChanged(int))); + outputMenu->setItemParameter(lastIndex, i); } - lastIndex = menu->insertItem(SmallIcon("forward"), i18n("Next available output")); - if (connected_displays < 2) { - menu->setItemEnabled(lastIndex, false); + if (connected_displays >= 2) + { + lastIndex = outputMenu->insertItem(SmallIcon("forward"), i18n("Next available output")); + outputMenu->connectItem(lastIndex, this, TQ_SLOT(slotCycleDisplays())); } - menu->connectItem(lastIndex, this, TQT_SLOT(slotCycleDisplays())); + + menu->insertItem(SmallIcon("kcmkwm"), i18n("Output Port"), outputMenu); } } @@ -830,7 +851,7 @@ void KRandRSystemTray::slotDisplayProfileChanged(int parameter) profileName = ""; } TQPtrList<SingleScreenData> profileData = loadDisplayConfiguration(profileName, locateLocal("config", "/", true)); - applyDisplayConfiguration(profileData, TRUE, locateLocal("config", "/", true)); + applyDisplayConfiguration(profileData, true, locateLocal("config", "/", true)); destroyScreenInformationObject(profileData); } @@ -858,7 +879,7 @@ void KRandRSystemTray::slotOutputChanged(int parameter) randr_screen_info->cur_output->auto_set = 1; randr_screen_info->cur_output->off_set = 0; output_auto (randr_screen_info, randr_screen_info->cur_output); - i=main_low_apply(randr_screen_info); + main_low_apply(randr_screen_info); if (!randr_screen_info->outputs[parameter]->cur_crtc) { output_name = randr_screen_info->outputs[parameter]->info->name; @@ -873,7 +894,7 @@ void KRandRSystemTray::slotOutputChanged(int parameter) randr_screen_info->cur_output->auto_set = 0; randr_screen_info->cur_output->off_set = 1; output_off(randr_screen_info, randr_screen_info->cur_output); - i=main_low_apply(randr_screen_info); + main_low_apply(randr_screen_info); findPrimaryDisplay(); refresh(); @@ -888,7 +909,7 @@ void KRandRSystemTray::slotOutputChanged(int parameter) } void KRandRSystemTray::deviceChanged (TDEGenericDevice* device) { -#ifdef __TDE_HAVE_TDEHWLIB +#ifdef WITH_TDEHWLIB if (device->type() == TDEGenericDeviceType::Monitor) { KRandrPassivePopup::message( i18n("New display output options are available!"), @@ -903,6 +924,6 @@ void KRandRSystemTray::deviceChanged (TDEGenericDevice* device) { void KRandRSystemTray::slotHelpContents() { - kapp->invokeHelp(TQString::null, "tderandrtray"); + tdeApp->invokeHelp(TQString::null, "tderandrtray"); } diff --git a/kcontrol/randr/tderandrtray.desktop b/kcontrol/randr/tderandrtray.desktop index 1f920524f..9d9c899df 100644 --- a/kcontrol/randr/tderandrtray.desktop +++ b/kcontrol/randr/tderandrtray.desktop @@ -2,134 +2,8 @@ Name=TDERandRTray GenericName=Screen Resize & Rotate -GenericName[af]=Skerm Hervergroot & Roteer -GenericName[be]=Змена памераў экрана і перагортванне -GenericName[bg]=Размер и ротация на екрана -GenericName[bn]=পর্দা মাপবদল ও আবর্তন -GenericName[br]=Adventañ ha treiñ ar skramm -GenericName[bs]=Veličina i rotacija ekrana -GenericName[ca]=Amida i gira la pantalla -GenericName[cs]=Změna velikosti a rotace obrazovky -GenericName[csb]=Òbrócenié ë zjinaka miarë ekranu -GenericName[cy]=Newid Maint a Cylchdroi'r Sgrîn -GenericName[da]=Ændr størrelse på skærm & Rotér -GenericName[de]=Bildschirmgröße & -ausrichtung ändern -GenericName[el]=Αλλαγή μεγέθους & Περιστροφή οθόνης -GenericName[eo]=Regrandigi kaj Turni Ekranon -GenericName[es]=Redimensionar y rotar pantalla -GenericName[et]=Ekraani suuruse muutmine ja pööramine -GenericName[eu]=Pantailaren tamaina aldaketa eta biraketa -GenericName[fa]=تغییر اندازه و چرخش پرده -GenericName[fi]=Näytön kuvan koon muuttaminen ja kuvan kääntäminen -GenericName[fr]=Redimensionnement et rotation de l'écran -GenericName[fy]=Skerm rotearje en grutte wizigje -GenericName[gl]=Rotación e Redimensionamento da Pantallla -GenericName[he]=שינוי גודל המסך וסיבובו -GenericName[hr]=Veličine i orijentacija zaslona -GenericName[hu]=Képernyőbeállító -GenericName[is]=Stærð og snúningur skjáa -GenericName[it]=Ruota e ridimensiona lo schermo -GenericName[ja]=スクリーンのリサイズと回転 -GenericName[ka]=ეკრანის ზომა და ორიენტაცია -GenericName[kk]=Экранды өзгерту және бұрау -GenericName[km]=ប្ដូរទំហំ & បង្វិលអេក្រង់ -GenericName[ko]=화면 크기 조정 및 회전 -GenericName[lt]=Ekrano dydžio keitimas ir pasukimas -GenericName[mk]=Големина и ротација на екранот -GenericName[ms]=Saiz Semula Skrin & Putar -GenericName[nb]=Endre størrelsen på og rotere skjermbildet -GenericName[nds]=Schirmgrött un -utrichten ännern -GenericName[ne]=पर्दा रिसाइज र परिक्रमण -GenericName[nl]=Scherm roteren en grootte wijzigen -GenericName[nn]=Endra storleiken på og roter skjermbiletet -GenericName[pa]=ਪਰਦਾ ਮੁੜ ਆਕਾਰ ਤੇ ਘੁੰਮਾਓ -GenericName[pl]=Obrót i zmiana rozmiaru ekranu -GenericName[pt]=Mudar o Tamanho e Rodar o Ecrã -GenericName[pt_BR]=Redimensionar Tela & Rotacionar -GenericName[ro]=Redimensionare și rotire ecran -GenericName[ru]=Изменение размера и ориентации экрана -GenericName[rw]=Kuhindura ingano & Kuzengurutsa Mugaragaza -GenericName[se]=Rievdat šearbmagova sturrodaga ja jorat dan -GenericName[sk]=Zmena veľkosti a otočenia obrazovky -GenericName[sl]=Spreminjanje velikosti in obračanje zaslona -GenericName[sr]=Промена величине и ротација екрана -GenericName[sr@Latn]=Promena veličine i rotacija ekrana -GenericName[sv]=Ändra skärmstorlek och rotera -GenericName[ta]=திரை அளவு மாற்று & சுழற்று -GenericName[tg]=Ивази андоза ва мавқеи экран -GenericName[th]=ปรับขนาดและหมุนหน้าจอ -GenericName[tr]=Ekran Boyutlandır ve Döndür -GenericName[tt]=Küräk Ülçäme & Borılışı -GenericName[uk]=Зміна розміру та обертання екрана -GenericName[uz]=Ekraning oʻlchamini oʻzgartirish va burish -GenericName[uz@cyrillic]=Экранинг ўлчамини ўзгартириш ва буриш -GenericName[vi]=Thay đổi cỡ màn hình & Quay -GenericName[wa]=Candjî l' grandeu del waitroûle eyet l' tourner -GenericName[zh_CN]=屏幕大小和旋转 -GenericName[zh_TW]=螢幕調整大小及旋轉 Comment=Resize and rotate X screens. -Comment[af]=Hervergroot en roteer X skerms. -Comment[ar]=غيير القياس و الدوران للشاشات X. -Comment[be]=Змена памераў і перагортванне экранаў X. -Comment[bg]=Размер и ротация на екрана. -Comment[bn]=আপনার এক্স-স্ক্রীণ-এর আকৃতি এবং দিশা পরিবর্তন করুন -Comment[br]=Adventañ ha treiñ ho diskweloù X. -Comment[bs]=Podesite veličinu i rotirajte vaš ekran. -Comment[ca]=Gira i amida les pantalles X. -Comment[cs]=Změna velikosti a rotace obrazovky. -Comment[csb]=Zjinaka miarë ë pòłożenia ekranów. -Comment[da]=Ændrer størrelse og roterer X-skærme -Comment[de]=Größe und Ausrichtung der Anzeige ändern -Comment[el]=Αλλαγή μεγέθους και περιστροφή της οθόνης. -Comment[eo]=Regrandigi kaj turni X ekranojn. -Comment[es]=Ajustar el tamaño y rotar las pantallas X. -Comment[et]=X'i ekraani muutmine ja pööramine -Comment[eu]=Aldatu tamaina eta biratu zure X pantailak. -Comment[fa]=تغییر اندازه و چرخش پردههای X. -Comment[fi]=Näytön kuvan koon muuttaminen ja kuvan kääntäminen -Comment[fr]=Redimensionner et retourner votre affichage. -Comment[fy]=Skermgrutte wizigje en rotearje X skermen -Comment[ga]=Athraigh an méid agus rothlaigh scáileáin X. -Comment[gl]=Redimensionar e rotar pantallas -Comment[he]=שנה את גודלה של התצוגה שלך וסובב אותה. -Comment[hr]=Promjena veličine i orijentacije X zaslona -Comment[hu]=A képernyő átméretezése, elforgatása -Comment[is]=Breyta stærð skjásins og snúa honum. -Comment[it]=Ridimensiona e ruota gli schermi di X. -Comment[ja]=X スクリーンのリサイズと回転。 -Comment[ka]=ეკრანის ზომის და ორიენტაციის შეცვლა -Comment[kk]=Экранның өлшемін және бағытын өзгерту -Comment[km]=ប្ដូរទំហំ និងបង្វិលអេក្រង់ X ។ -Comment[lt]=Keisti X ekrano dydį ir orientaciją. -Comment[mk]=Сменете ја големината и ротацијата на вашиот екран -Comment[nb]=Endrer størrelsen på og roterer X-skjermbildet -Comment[nds]=Grött un Utrichten vun den X-Schirm ännern -Comment[ne]=X पर्दा रिसाइज गर्नुहोस् र घुमाउनुहोस् -Comment[nl]=Scherm roteren en van grootte veranderen -Comment[nn]=Endra storleiken på og roter X-skjermbiletet. -Comment[pa]=X ਸਕਰੀਨ ਨੂੰ ਮੁੜ-ਅਕਾਰ ਅਤੇ ਘੁੰਮਾਓ। -Comment[pl]=Zmiana rozmiaru i orientacji ekranów. -Comment[pt]=Mudar o tamanho e rodar os ecrãs do X. -Comment[pt_BR]=Redimensiona e rotaciona as tela do X. -Comment[ro]=Redimensionează și rotește ecranele X. -Comment[ru]=Изменение размера и ориентации экранов X. -Comment[se]=Rievdat X-šearpmaid sturrodaga ja joraheami. -Comment[sk]=Zmení veľkosť a otočí obrazovky -Comment[sl]=Spremenite velikost in obrnite zaslon. -Comment[sr]=Промените величину и оријентацију екрана -Comment[sr@Latn]=Promenite veličinu i orijentaciju ekrana -Comment[sv]=Storleksändring och rotation av X-skärmar. -Comment[tg]=Ивази андоза ва мавқеи экранҳои Х. -Comment[th]=ปรับแต่งการแสดงผลของ X -Comment[tr]=Ekranı boyutlandır ve çevir. -Comment[uk]=Зміна розміру та обертання екранів X. -Comment[uz]=Ekraning oʻlchamini oʻzgartirish va burish -Comment[uz@cyrillic]=Экранинг ўлчамини ўзгартириш ва буриш -Comment[vi]=Đổi cỡ và quay màn hình X. -Comment[wa]=Candjî l' grandeu eyet tourner les waitroûles X. -Comment[zh_CN]=更改 X 屏幕的大小和旋转。 -Comment[zh_TW]=調整大小及旋轉 X 螢幕。 Exec=tderandrtray Icon=randr diff --git a/kcontrol/randr/tderandrtray.h b/kcontrol/randr/tderandrtray.h index 334e1ef31..5d6e16053 100644 --- a/kcontrol/randr/tderandrtray.h +++ b/kcontrol/randr/tderandrtray.h @@ -22,9 +22,9 @@ #include <tqptrlist.h> #include <ksystemtray.h> -#include <kglobalaccel.h> +#include <tdeglobalaccel.h> -#ifdef __TDE_HAVE_TDEHWLIB +#ifdef WITH_TDEHWLIB #include <tdehardwaredevices.h> #else #define TDEGenericDevice void @@ -37,7 +37,7 @@ class TDEPopupMenu; class KRandRSystemTray : public KSystemTray, public KRandrSimpleAPI { - Q_OBJECT + TQ_OBJECT public: KRandRSystemTray(TQWidget* parent = 0, const char *name = 0); @@ -91,8 +91,8 @@ private: int last_known_y; TDEPopupMenu* m_menu; - KSimpleConfig *r_config; - KSimpleConfig *t_config; + TDESimpleConfig *r_config; + TDESimpleConfig *t_config; private slots: void _quit(); |