[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdepim/kalarm
From:       David Jarvie <software () astrojar ! org ! uk>
Date:       2009-05-25 18:32:34
Message-ID: 1243276354.800167.32031.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 972813 by djarvie:

Rename Resources -> Calendars (menu item missed in previous change).
Fix duplicated menu item shortcut.


 M  +4 -6      mainwindow.cpp  
 M  +0 -3      mainwindow.h  


--- trunk/KDE/kdepim/kalarm/mainwindow.cpp #972812:972813
@@ -112,9 +112,6 @@
 QString MainWindow::i18n_chk_ShowAlarmTime()       { return i18nc("@option:check", \
"Show alarm time"); }  QString MainWindow::i18n_o_ShowTimeToAlarms()      { return \
i18nc("@action", "Show Time t&o Alarms"); }  QString \
MainWindow::i18n_chk_ShowTimeToAlarm()     { return i18nc("@option:check", "Show time \
                until alarm"); }
-QString MainWindow::i18n_a_ShowArchivedAlarms()    { return i18nc("@action", "Show \
                &Archived Alarms"); }
-QString MainWindow::i18n_tip_ShowArchivedAlarms()  { return i18nc("@info:tooltip", \
                "Show Archived Alarms"); }
-QString MainWindow::i18n_tip_HideArchivedAlarms()  { return i18nc("@info:tooltip", \
"Hide Archived Alarms"); }  
 
 /******************************************************************************
@@ -465,7 +462,7 @@
 	mActionShowTimeTo->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_I));
 	connect(mActionShowTimeTo, SIGNAL(triggered(bool)), SLOT(slotShowTimeTo()));
 
-	mActionShowArchived = new KToggleAction(i18n_a_ShowArchivedAlarms(), this);
+	mActionShowArchived = new KToggleAction(i18nc("@action", "Show Archi&ved Alarms"), \
this);  actions->addAction(QLatin1String("showArchivedAlarms"), mActionShowArchived);
 	mActionShowArchived->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_P));
 	connect(mActionShowArchived, SIGNAL(triggered(bool)), SLOT(slotShowArchived()));
@@ -474,7 +471,7 @@
 	actions->addAction(QLatin1String("showInSystemTray"), mActionToggleTrayIcon);
 	connect(mActionToggleTrayIcon, SIGNAL(triggered(bool)), \
SLOT(slotToggleTrayIcon()));  
-	mActionToggleResourceSel = new KToggleAction(KIcon("view-choose"), i18nc("@action", \
"Show &Resources"), this); +	mActionToggleResourceSel = new \
KToggleAction(KIcon("view-choose"), i18nc("@action", "Show &Calendars"), this);  \
actions->addAction(QLatin1String("showResources"), mActionToggleResourceSel);  \
connect(mActionToggleResourceSel, SIGNAL(triggered(bool)), \
SLOT(slotToggleResourceSelector()));  
@@ -801,7 +798,8 @@
 {
 	mShowArchived = !mShowArchived;
 	mActionShowArchived->setChecked(mShowArchived);
-	mActionShowArchived->setToolTip(mShowArchived ? i18n_tip_HideArchivedAlarms() : \
i18n_tip_ShowArchivedAlarms()); +	mActionShowArchived->setToolTip(mShowArchived ? \
i18nc("@info:tooltip", "Hide Archived Alarms") +	                                     \
: i18nc("@info:tooltip", "Show Archived Alarms"));  \
mListFilterModel->setStatusFilter(mShowArchived ? \
static_cast<KCalEvent::Status>(KCalEvent::ACTIVE | KCalEvent::ARCHIVED) : \
KCalEvent::ACTIVE);  mListView->reset();
 	KConfigGroup config(KGlobal::config(), VIEW_GROUP);
--- trunk/KDE/kdepim/kalarm/mainwindow.h #972812:972813
@@ -81,9 +81,6 @@
 		static QString i18n_chk_ShowAlarmTime();      // text of 'Show alarm time' \
checkbox  static QString i18n_o_ShowTimeToAlarms();     // text of 'Show Time to \
Alarms' action, with 'O' shortcut  static QString i18n_chk_ShowTimeToAlarm();    // \
                text of 'Show time until alarm' checkbox
-		static QString i18n_a_ShowArchivedAlarms();   // text of 'Show Archived Alarms' \
                action, with 'A' shortcut
-		static QString i18n_tip_ShowArchivedAlarms(); // text of 'Show Archived Alarms' \
                tooltip
-		static QString i18n_tip_HideArchivedAlarms(); // text of 'Hide Archived Alarms' \
tooltip  
 	public slots:
 		virtual void   show();


[prev in list] [next in list] [prev in thread] [next in thread]