diff options
Diffstat (limited to 'kicker')
| -rw-r--r-- | kicker/kicker/buttons/kbutton.cpp | 2 | ||||
| -rw-r--r-- | kicker/kicker/buttons/kmenu.desktop | 120 | ||||
| -rw-r--r-- | kicker/kicker/buttons/knewbutton.cpp | 16 | ||||
| -rw-r--r-- | kicker/kicker/core/container_button.h | 2 | ||||
| -rw-r--r-- | kicker/kicker/core/menumanager.cpp | 4 | ||||
| -rw-r--r-- | kicker/kicker/ui/k_mnu.cpp | 12 | ||||
| -rw-r--r-- | kicker/libkicker/kickerSettings.kcfg | 14 | ||||
| -rw-r--r-- | kicker/menuext/tom/tom.cc | 6 |
8 files changed, 88 insertions, 88 deletions
diff --git a/kicker/kicker/buttons/kbutton.cpp b/kicker/kicker/buttons/kbutton.cpp index 79f2f0bb2..a07a06cfc 100644 --- a/kicker/kicker/buttons/kbutton.cpp +++ b/kicker/kicker/buttons/kbutton.cpp @@ -43,7 +43,7 @@ KButton::KButton( TQWidget* parent ) : PanelPopupButton( parent, "KButton", KickerSettings::showDeepButtons() ) { TQToolTip::add(this, i18n("Applications, tasks and desktop sessions")); - setTitle(i18n("K Menu")); + setTitle(i18n("TDE Menu")); setPopup(MenuManager::the()->kmenu()->widget()); MenuManager::the()->registerKButton(this); diff --git a/kicker/kicker/buttons/kmenu.desktop b/kicker/kicker/buttons/kmenu.desktop index be9a0aa68..4565fecc6 100644 --- a/kicker/kicker/buttons/kmenu.desktop +++ b/kicker/kicker/buttons/kmenu.desktop @@ -1,70 +1,70 @@ [Desktop Entry] -Name=K Menu -Name[af]=K-Kieslys -Name[ar]=قائمة K -Name[be]=Меню KDE +Name=TDE Menu +Name[af]=TDE-Kieslys +Name[ar]=قائمة TDE +Name[be]=Меню TDE Name[bg]=Главно меню Name[bn]=কে মেনু -Name[br]=Meuziad K -Name[bs]=K meni -Name[ca]=Menú K -Name[cs]=Nabídka KDE -Name[cy]=Y Ddewislen K -Name[da]=K-Menu -Name[de]=K-Menü -Name[el]=Μενού K -Name[eo]=KDEa Menuo -Name[es]=Menú de KDE -Name[et]=K menüü -Name[eu]=K menua -Name[fa]=گزینگان K -Name[fi]=K-valikko -Name[fr]=Menu K -Name[fy]=K-menu -Name[ga]=Roghchlár K -Name[gl]=Menu de KDE -Name[he]=תפריט K -Name[hr]=KDE izbornik -Name[hu]=KDE menü -Name[is]=K valmynd -Name[it]=Menu K -Name[ja]=K メニュー -Name[ka]=K მენიუ -Name[kk]=K мәзірі -Name[km]=ម៉ឺនុយ K -Name[ko]=KDE 메뉴 -Name[lt]=K meniu +Name[br]=Meuziad TDE +Name[bs]=TDE meni +Name[ca]=Menú TDE +Name[cs]=Nabídka TDE +Name[cy]=Y Ddewislen TDE +Name[da]=TDE-Menu +Name[de]=TDE-Menü +Name[el]=Μενού TDE +Name[eo]=TDEa Menuo +Name[es]=Menú de TDE +Name[et]=TDE menüü +Name[eu]=TDE menua +Name[fa]=گزینگان TDE +Name[fi]=TDE-valikko +Name[fr]=Menu TDE +Name[fy]=TDE-menu +Name[ga]=Roghchlár TDE +Name[gl]=Menu de TDE +Name[he]=תפריט TDE +Name[hr]=TDE izbornik +Name[hu]=TDE menü +Name[is]=TDE valmynd +Name[it]=Menu TDE +Name[ja]=TDE メニュー +Name[ka]=TDE მენიუ +Name[kk]=TDE мәзірі +Name[km]=ម៉ឺនុយ TDE +Name[ko]=TDE 메뉴 +Name[lt]=TDE meniu Name[mk]=К-мени -Name[nb]=KDE-meny -Name[nds]=K-Menü +Name[nb]=TDE-meny +Name[nds]=TDE-Menü Name[ne]=के मेनु -Name[nl]=K-menu -Name[nn]=K-meny -Name[pa]=K ਮੇਨੂ -Name[pl]=Menu K -Name[pt]=Menu K -Name[pt_BR]=Menu K -Name[ro]=Meniu K -Name[ru]=Меню KDE -Name[rw]=K Ibikubiyemo -Name[se]=K-fállu -Name[sk]=Menu KDE -Name[sl]=Meni KDE-ja -Name[sr]=K-мени -Name[sr@Latn]=K-meni -Name[sv]=K-meny +Name[nl]=TDE-menu +Name[nn]=TDE-meny +Name[pa]=TDE ਮੇਨੂ +Name[pl]=Menu TDE +Name[pt]=Menu TDE +Name[pt_BR]=Menu TDE +Name[ro]=Meniu TDE +Name[ru]=Меню TDE +Name[rw]=TDE Ibikubiyemo +Name[se]=TDE-fállu +Name[sk]=Menu TDE +Name[sl]=Meni TDE-ja +Name[sr]=TDE-мени +Name[sr@Latn]=TDE-meni +Name[sv]=TDE-meny Name[te]=కె పట్టి -Name[tg]=Менюи KDE -Name[th]=เมนู KDE -Name[tr]=KDE Menüsü -Name[tt]=K-Saylaq -Name[uk]=K Меню -Name[uz]=K-menyu +Name[tg]=Менюи TDE +Name[th]=เมนู TDE +Name[tr]=TDE Menüsü +Name[tt]=TDE-Saylaq +Name[uk]=TDE Меню +Name[uz]=TDE-menyu Name[uz@cyrillic]=К-меню -Name[vi]=Thực đơn KDE -Name[wa]=Dressêye K -Name[zh_CN]=K 菜单 -Name[zh_TW]=K 選單 +Name[vi]=Thực đơn TDE +Name[wa]=Dressêye TDE +Name[zh_CN]=TDE 菜单 +Name[zh_TW]=TDE 選單 Comment=Applications and common actions Comment[af]=Programme en algemene aksies Comment[ar]=تطبيقات و أعمال شائعة diff --git a/kicker/kicker/buttons/knewbutton.cpp b/kicker/kicker/buttons/knewbutton.cpp index 578ff547e..89a65ea70 100644 --- a/kicker/kicker/buttons/knewbutton.cpp +++ b/kicker/kicker/buttons/knewbutton.cpp @@ -55,18 +55,18 @@ KNewButton::KNewButton( TQWidget* parent ) : KButton( parent ), m_oldPos(0,0) { - - setTitle(i18n("K Menu")); + + setTitle(i18n("TDE Menu")); Q_ASSERT( !m_self ); m_self = this; m_openTimer = -1; m_hoverTimer = -1; m_mouseInside = false; m_drag = false; - + setIcon("kmenu"); setIcon(KickerSettings::customKMenuIcon()); - + TQApplication::desktop()->screen()->installEventFilter(this); if (KickerSettings::showKMenuText()) @@ -74,8 +74,8 @@ KNewButton::KNewButton( TQWidget* parent ) setButtonText(KickerSettings::kMenuText()); setFont(KickerSettings::buttonFont()); setTextColor(KickerSettings::buttonTextColor()); - } - + } + repaint(); } @@ -182,12 +182,12 @@ void KNewButton::mouseMoveEvent(TQMouseEvent* e) m_mouseInside = m_sloppyRegion.contains(e->pos()); - if ( m_sloppyRegion.contains(e->pos())) + if ( m_sloppyRegion.contains(e->pos())) { if (m_hoverTimer == -1 && KickerSettings::openOnHover()) m_hoverTimer = startTimer(kMax(200,TQApplication::doubleClickInterval()/2)); } - else if (m_hoverTimer != -1) + else if (m_hoverTimer != -1) { killTimer(m_hoverTimer); m_hoverTimer = -1; diff --git a/kicker/kicker/core/container_button.h b/kicker/kicker/core/container_button.h index d268d21ab..f67ac5ec2 100644 --- a/kicker/kicker/core/container_button.h +++ b/kicker/kicker/core/container_button.h @@ -86,7 +86,7 @@ public: KMenuButtonContainer(TQPopupMenu* opMenu, TQWidget* parent = 0); virtual TQString appletType() const { return "KMenuButton"; } virtual TQString icon() const { return "kmenu"; } - virtual TQString visibleName() const { return i18n("K Menu"); } + virtual TQString visibleName() const { return i18n("TDE Menu"); } virtual int heightForWidth( int width ) const; bool isAMenu() const { return true; } diff --git a/kicker/kicker/core/menumanager.cpp b/kicker/kicker/core/menumanager.cpp index af24e50da..763b6cbc1 100644 --- a/kicker/kicker/core/menumanager.cpp +++ b/kicker/kicker/core/menumanager.cpp @@ -45,7 +45,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // MenuManager gets created before the ExtensionManager // So using KStaticDeleter results in MenuManager getting // deleted before ExtensionManager, which means also the panels -// which means also the K Menu buttons. K Menu buttons call +// which means also the TDE Menu buttons. TDE Menu buttons call // MenuManager in their dtor, so if MenuManager is already gone // then every KButton will cause it to be reconstructed. // So we rely on Kicker to delete MenuManager on the way out @@ -65,7 +65,7 @@ MenuManager* MenuManager::the() MenuManager::MenuManager(TQObject *parent) : TQObject(parent, "MenuManager"), DCOPObject("MenuManager") { - if (KickerSettings::legacyKMenu()) + if (KickerSettings::legacyKMenu()) m_kmenu = new KMenuStub(new PanelKMenu); else m_kmenu = new KMenuStub(new KMenu); diff --git a/kicker/kicker/ui/k_mnu.cpp b/kicker/kicker/ui/k_mnu.cpp index 30185312d..63a640000 100644 --- a/kicker/kicker/ui/k_mnu.cpp +++ b/kicker/kicker/ui/k_mnu.cpp @@ -84,7 +84,7 @@ PanelKMenu::PanelKMenu() // Don't automatically clear the main menu. disableAutoClear(); actionCollection = new KActionCollection(this); - setCaption(i18n("K Menu")); + setCaption(i18n("TDE Menu")); connect(Kicker::the(), TQT_SIGNAL(configurationChanged()), this, TQT_SLOT(configChanged())); DCOPClient *dcopClient = KApplication::dcopClient(); @@ -135,7 +135,7 @@ void PanelKMenu::hideMenu() kapp->eventLoop()->processEvents(TQEventLoop::ExcludeUserInput, 1000); // HACK - // The K Menu takes an unknown amount of time to disappear, and redrawing + // The TDE Menu takes an unknown amount of time to disappear, and redrawing // the underlying window(s) also takes time. This should allow both of those // events to occur (unless you're on a 200MHz Pentium 1 or similar ;-)) // thereby removing a bad shutdown screen artifact while still providing @@ -217,9 +217,9 @@ void PanelKMenu::paletteChanged() /* A MenuHBox is supposed to be inserted into a menu. * You can set a special widget in the hbox which will - * get the focus if the user moves up or down with the + * get the focus if the user moves up or down with the * cursor keys - */ + */ class MenuHBox : public TQHBox { public: MenuHBox(PanelKMenu* parent) : TQHBox(parent) @@ -269,7 +269,7 @@ void PanelKMenu::initialize() hbox->setFocusProxy(searchEdit); hbox->setSpacing( 3 ); connect(clearButton, TQT_SIGNAL(clicked()), searchEdit, TQT_SLOT(clear())); - connect(this, TQT_SIGNAL(aboutToHide()), this, TQT_SLOT(slotClearSearch())); + connect(this, TQT_SIGNAL(aboutToHide()), this, TQT_SLOT(slotClearSearch())); connect(searchEdit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT( slotUpdateSearch( const TQString&))); insertItem(hbox, searchLineID, 0); @@ -717,7 +717,7 @@ void PanelKMenu::keyPressEvent(TQKeyEvent* e) else if (e->key() == TQt::Key_Escape && searchEdit->text().isEmpty() == false) { searchEdit->clear(); } - else if (e->key() == TQt::Key_Delete && !searchEdit->hasFocus() && + else if (e->key() == TQt::Key_Delete && !searchEdit->hasFocus() && searchEdit->text().isEmpty() == false) { searchEdit->clear(); diff --git a/kicker/libkicker/kickerSettings.kcfg b/kicker/libkicker/kickerSettings.kcfg index 7e1e26651..9a4abc7fc 100644 --- a/kicker/libkicker/kickerSettings.kcfg +++ b/kicker/libkicker/kickerSettings.kcfg @@ -121,7 +121,7 @@ </entry> <entry name="LegacyKMenu" type="Bool" > - <label>When this option is enabled, the classic K Menu is used.</label> + <label>When this option is enabled, the classic TDE Menu is used.</label> <default>true</default> </entry> @@ -365,27 +365,27 @@ </entry> <entry name="SidePixmapName" key="SideName" type="String" > - <label>The name of the file to use as the side image in the K Menu</label> + <label>The name of the file to use as the side image in the TDE Menu</label> <default>kside.png</default> </entry> <entry name="SideTileName" key="SideTileName" type="String" > - <label>The name of the file used as a tile to fill the height of K Menu that SidePixmapName does not cover</label> + <label>The name of the file used as a tile to fill the height of TDE Menu that SidePixmapName does not cover</label> <default>kside_tile.png</default> </entry> <entry name="ShowKMenuText" key="ShowText" type="Bool" > - <label>Show text on the K Menu button</label> + <label>Show text on the TDE Menu button</label> <default>false</default> </entry> <entry name="KMenuText" key="Text" type="String" > - <label>Text to be shown on K Menu Button</label> + <label>Text to be shown on TDE Menu Button</label> <default code="true">i18n("Applications")</default> </entry> <entry name="CustomKMenuIcon" key="CustomIcon" type="Path" > - <label>Custom K Menu Button Icon</label> + <label>Custom TDE Menu Button Icon</label> <default code="true">QString("kmenu")</default> </entry> @@ -451,7 +451,7 @@ </group> - <group name="SearchField"> + <group name="SearchField"> <entry key="History" type="PathList"> <default></default> <label></label> diff --git a/kicker/menuext/tom/tom.cc b/kicker/menuext/tom/tom.cc index e7505867a..cdedfc73d 100644 --- a/kicker/menuext/tom/tom.cc +++ b/kicker/menuext/tom/tom.cc @@ -340,13 +340,13 @@ int TOM::appendTaskGroup(KConfig& config, bool inSubMenu) } else { - + TQIconSet iconset = BarIconSet(icon, 22); if (iconset.isNull()) taskGroup->insertItem(name, m_maxIndex); else taskGroup->insertItem(iconset, name, m_maxIndex); - + } m_tasks.insert(m_maxIndex, pService); @@ -619,7 +619,7 @@ void TOM::removeTask() } } -// TODO: should we have a side graphic like the K Menu? personally, i don't +// TODO: should we have a side graphic like the TDE Menu? personally, i don't // think it helps usability. it's nice for branding, but that's it. perhaps a // top image, or something blended with the actual menu background? deffinitely // a job for a graphic artist. |