[prev in list] [next in list] [prev in thread] [next in thread]
List: knode-devel
Subject: [Knode-devel] KDE/kdepim
From: Jakob Petsovits <jpetso () gmx ! at>
Date: 2007-12-05 23:49:19
Message-ID: 1196898559.817020.26607.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 745331 by jpetso:
Icon renaming (code changes - kdepim):
mail -> mail-message
...and lots of other stuff which got in my way
while doing that one.
M +2 -2 kalarm/eventlistmodel.cpp
M +2 -2 kalarm/newalarmaction.cpp
M +7 -7 kalarm/prefdlg.cpp
M +1 -1 knode/kncomposer.cpp
M +1 -1 knode/knconfig.cpp
M +10 -10 korganizer/actionmanager.cpp
M +16 -16 ktnef/ktnefmain.cpp
--- trunk/KDE/kdepim/kalarm/eventlistmodel.cpp #745330:745331
@@ -83,10 +83,10 @@
for(int x=0; x<mEvents.count(); ++x)kDebug()<<"Event"<<(void*)mEvents[x];
if (!mTextIcon)
{
- mTextIcon = new QPixmap(SmallIcon("text"));
+ mTextIcon = new QPixmap(SmallIcon("dialog-information"));
mFileIcon = new QPixmap(SmallIcon("document-open"));
mCommandIcon = new QPixmap(SmallIcon("system-run"));
- mEmailIcon = new QPixmap(SmallIcon("mail"));
+ mEmailIcon = new QPixmap(SmallIcon("mail-message-new"));
mIconSize = mTextIcon->size().expandedTo(mFileIcon->size()).expandedTo(mCommandIcon->size()).expandedTo(mEmailIcon->size());
}
MinuteTimer::connect(this, SLOT(slotUpdateTimeTo()));
--- trunk/KDE/kdepim/kalarm/newalarmaction.cpp #745330:745331
@@ -34,11 +34,11 @@
: KActionMenu(KIcon("document-new"), label, parent)
{
setShortcuts(KStandardShortcut::openNew());
- QAction* act = menu()->addAction(KIcon(QLatin1String("view-close")), (templates ? \
i18nc("@item:inmenu", "&Display Alarm Template") : i18nc("@item:inmenu", "Display \
Alarm"))); + QAction* act = \
menu()->addAction(KIcon(QLatin1String("dialog-information")), (templates ? \
i18nc("@item:inmenu", "&Display Alarm Template") : i18nc("@item:inmenu", "Display \
Alarm"))); mTypes[act] = EditAlarmDlg::DISPLAY;
mCommandAction = menu()->addAction(KIcon(QLatin1String("system-run")), (templates ? \
i18nc("@item:inmenu", "&Command Alarm Template") : i18nc("@item:inmenu", "Command \
Alarm"))); mTypes[mCommandAction] = EditAlarmDlg::COMMAND;
- act = menu()->addAction(KIcon(QLatin1String("mail")), (templates ? \
i18nc("@item:inmenu", "&Email Alarm Template") : i18nc("@item:inmenu", "Email \
Alarm"))); + act = menu()->addAction(KIcon(QLatin1String("mail-message-new")), \
(templates ? i18nc("@item:inmenu", "&Email Alarm Template") : i18nc("@item:inmenu", \
"Email Alarm"))); mTypes[act] = EditAlarmDlg::EMAIL;
setDelayed(false);
connect(menu(), SIGNAL(aboutToShow()), SLOT(slotInitMenu()));
--- trunk/KDE/kdepim/kalarm/prefdlg.cpp #745330:745331
@@ -136,43 +136,43 @@
mMiscPage = new MiscPrefTab;
mMiscPageItem = new KPageWidgetItem(mMiscPage, i18nc("@title:tab", "General"));
mMiscPageItem->setHeader(i18nc("@title", "General"));
- mMiscPageItem->setIcon(KIcon(DesktopIcon("misc")));
+ mMiscPageItem->setIcon(KIcon(DesktopIcon("preferences-other")));
addPage(mMiscPageItem);
mTimePage = new TimePrefTab;
mTimePageItem = new KPageWidgetItem(mTimePage, i18nc("@title:tab", "Time & Date"));
mTimePageItem->setHeader(i18nc("@title", "Time and Date"));
- mTimePageItem->setIcon(KIcon(DesktopIcon("clock")));
+ mTimePageItem->setIcon(KIcon(DesktopIcon("preferences-system-time")));
addPage(mTimePageItem);
mStorePage = new StorePrefTab;
mStorePageItem = new KPageWidgetItem(mStorePage, i18nc("@title:tab", "Storage"));
mStorePageItem->setHeader(i18nc("@title", "Alarm Storage"));
- mStorePageItem->setIcon(KIcon(DesktopIcon("document-open")));
+ mStorePageItem->setIcon(KIcon(DesktopIcon("system-file-manager")));
addPage(mStorePageItem);
mEmailPage = new EmailPrefTab;
mEmailPageItem = new KPageWidgetItem(mEmailPage, i18nc("@title:tab", "Email"));
mEmailPageItem->setHeader(i18nc("@title", "Email Alarm Settings"));
- mEmailPageItem->setIcon(KIcon(DesktopIcon("mail")));
+ mEmailPageItem->setIcon(KIcon(DesktopIcon("internet-mail")));
addPage(mEmailPageItem);
mViewPage = new ViewPrefTab;
mViewPageItem = new KPageWidgetItem(mViewPage, i18nc("@title:tab", "View"));
mViewPageItem->setHeader(i18nc("@title", "View Settings"));
- mViewPageItem->setIcon(KIcon(DesktopIcon("view-choose")));
+ mViewPageItem->setIcon(KIcon(DesktopIcon("preferences-desktop-theme")));
addPage(mViewPageItem);
mFontColourPage = new FontColourPrefTab;
mFontColourPageItem = new KPageWidgetItem(mFontColourPage, i18nc("@title:tab", \
"Font & Color")); mFontColourPageItem->setHeader(i18nc("@title", "Default Font and \
Color"));
- mFontColourPageItem->setIcon(KIcon(DesktopIcon("colorize")));
+ mFontColourPageItem->setIcon(KIcon(DesktopIcon("preferences-desktop-color")));
addPage(mFontColourPageItem);
mEditPage = new EditPrefTab;
mEditPageItem = new KPageWidgetItem(mEditPage, i18nc("@title:tab", "Edit"));
mEditPageItem->setHeader(i18nc("@title", "Default Alarm Edit Settings"));
- mEditPageItem->setIcon(KIcon(DesktopIcon("edit")));
+ mEditPageItem->setIcon(KIcon(DesktopIcon("document-properties")));
addPage(mEditPageItem);
connect(this, SIGNAL(okClicked()), SLOT(slotOk()));
--- trunk/KDE/kdepim/knode/kncomposer.cpp #745330:745331
@@ -298,7 +298,7 @@
connect(a_ctDoPost, SIGNAL(triggered(bool) ), SLOT(slotToggleDoPost()));
a_ctDoMail = actionCollection()->add<KToggleAction>("send_mail");
- a_ctDoMail->setIcon(KIcon("mail"));
+ a_ctDoMail->setIcon(KIcon("mail-send"));
a_ctDoMail->setText(i18n("Send E&mail"));
connect(a_ctDoMail, SIGNAL(triggered(bool) ), SLOT(slotToggleDoMail()));
--- trunk/KDE/kdepim/knode/knconfig.cpp #745330:745331
@@ -183,7 +183,7 @@
i_cons[newFups] = UserIcon("newsubs");
i_cons[eyes] = UserIcon("eyes");
i_cons[ignore] = UserIcon("ignore");
- i_cons[mail] = SmallIcon("mail");
+ i_cons[mail] = SmallIcon("mail-message");
i_cons[posting] = UserIcon("article");
i_cons[canceledPosting] = SmallIcon("edit-delete");
i_cons[savedRemote] = SmallIcon("edit-copy");
--- trunk/KDE/kdepim/korganizer/actionmanager.cpp #745330:745331
@@ -278,7 +278,7 @@
mACollection->addAction( "downloadnewstuff", action );
connect( action, SIGNAL(triggered(bool)), SLOT(downloadNewStuff()) );
- action = new KAction( KIcon( "webexport" ), i18n( "Export &Web Page..." ), this );
+ action = new KAction( KIcon( "document-export-html" ), i18n( "Export &Web Page..." \
), this ); mACollection->addAction( "export_web", action );
connect( action, SIGNAL(triggered(bool)), mCalendarView, SLOT(exportWeb()) );
@@ -388,7 +388,7 @@
connect( action, SIGNAL(triggered(bool)), mCalendarView->viewManager(),
SLOT(showTodoView()) );
- action = new KAction( KIcon( "journal" ), i18n( "&Journal" ), this );
+ action = new KAction( KIcon( "view-pim-journal" ), i18n( "&Journal" ), this );
mACollection->addAction( "view_journal", action );
connect( action, SIGNAL(triggered(bool)), mCalendarView->viewManager(),
SLOT(showJournalView()) );
@@ -398,7 +398,7 @@
connect( action, SIGNAL(triggered(bool)), mCalendarView->viewManager(),
SLOT(showTimeLineView()) );
- action = new KAction( KIcon( "timespent" ), i18n( "Time&spent" ), this );
+ action = new KAction( KIcon( "view-calendar-time-spent" ), i18n( "Time&spent" ), \
this ); mACollection->addAction( "view_timespent", action );
connect( action, SIGNAL(triggered(bool)), mCalendarView->viewManager(),
SLOT(showTimeSpentView()) );
@@ -480,14 +480,14 @@
*/
/************************** Actions MENU *********************************/
- action = new KAction( KIcon( "appointment" ), i18n( "New E&vent..." ), this );
+ action = new KAction( KIcon( "appointment-new" ), i18n( "New E&vent..." ), this );
action->setIconText( i18n( "Event" ) );
action->setToolTip( i18n( "Create a new Event" ) );
mACollection->addAction( "new_event", action );
connect( action, SIGNAL(triggered(bool)), mCalendarView,
SLOT(newEvent()) );
- action = new KAction( KIcon( "newtodo" ), i18n( "New &To-do..." ), this );
+ action = new KAction( KIcon( "task-new" ), i18n( "New &To-do..." ), this );
action->setIconText( i18n( "To-do" ) );
action->setToolTip( i18n( "Create a new To-do" ) );
mACollection->addAction( "new_todo", action );
@@ -502,7 +502,7 @@
connect( mCalendarView,SIGNAL(todoSelected(bool)), action,
SLOT(setEnabled(bool)) );
- action = new KAction( KIcon( "newjournal" ), i18n( "New &Journal..." ), this );
+ action = new KAction( KIcon( "journal-new" ), i18n( "New &Journal..." ), this );
action->setIconText( i18n( "Journal" ) );
action->setToolTip( i18n( "Create a new Journal" ) );
mACollection->addAction( "new_journal", action );
@@ -547,7 +547,7 @@
connect( mPublishEvent, SIGNAL(triggered(bool)), mCalendarView, \
SLOT(schedule_publish()) ); mPublishEvent->setEnabled( false );
- action = new KAction( KIcon( "mail" ), i18n( "Send &Invitation to Attendees" ), \
this ); + action = new KAction( KIcon( "mail-send" ), i18n( "Send &Invitation to \
Attendees" ), this ); mACollection->addAction( "schedule_request", action );
connect( action, SIGNAL(triggered(bool)), mCalendarView, SLOT(schedule_request()) \
); action->setEnabled( false );
@@ -648,7 +648,7 @@
// this, SLOT(manageResources()),
// mACollection, "conf_resources" );
- action = new KAction( KIcon( "configure" ), i18n( "Manage View &Filters..." ), \
this ); + action = new KAction( KIcon( "view-filter" ), i18n( "Manage View \
&Filters..." ), this ); mACollection->addAction( "edit_filters", action );
connect( action, SIGNAL(triggered(bool)), mCalendarView,
SLOT(editFilters()) );
@@ -1710,7 +1710,7 @@
menu->insertItem( i18n( "Attach &inline" ), KOPrefs::InlineFull );
menu->insertItem( i18n( "Attach inline &without attachments" ), \
KOPrefs::InlineBody ); menu->insertSeparator();
- menu->insertItem( SmallIcon( "cancel" ), i18n( "C&ancel" ), KOPrefs::Ask );
+ menu->insertItem( SmallIcon( "dialog-cancel" ), i18n( "C&ancel" ), KOPrefs::Ask \
); action = menu->exec( QCursor::pos(), 0 );
delete menu;
}
@@ -1806,7 +1806,7 @@
menu->insertItem( i18n( "Attach as &link" ), KOPrefs::TodoAttachLink );
menu->insertItem( i18n( "Attach &inline" ), KOPrefs::TodoAttachInlineFull );
menu->insertSeparator();
- menu->insertItem( SmallIcon( "cancel" ), i18n( "C&ancel" ), \
KOPrefs::TodoAttachAsk ); + menu->insertItem( SmallIcon( "dialog-cancel" ), i18n( \
"C&ancel" ), KOPrefs::TodoAttachAsk ); action = menu->exec( QCursor::pos(), 0 );
delete menu;
}
--- trunk/KDE/kdepim/ktnef/ktnefmain.cpp #745330:745331
@@ -95,25 +95,25 @@
KAction *action = new KAction(KIcon(QString("zoom-original")), i18n("View"), \
this); actionCollection()->addAction("view_file", action );
connect(action, SIGNAL(triggered(bool)), SLOT(viewFile()));
- action = new KAction(KIcon(QString("package_applications")), i18n("View With..."), \
this); + action = new KAction(KIcon(QString("applications-other")), i18n("View \
With..."), this); actionCollection()->addAction("view_file_as", action );
connect(action, SIGNAL(triggered(bool)), SLOT(viewFileAs()));
- action = new KAction(i18n("Extract"), this);
- actionCollection()->addAction("extract_file", action );
- connect(action, SIGNAL(triggered(bool) ), SLOT(extractFile()));
- action = new KAction(KIcon(QString("ktnef_extract_to")), i18n("Extract To..."), \
this);
- actionCollection()->addAction("extract_file_to", action );
- connect(action, SIGNAL(triggered(bool)), SLOT(extractFileTo()));
- action = new KAction(KIcon(QString("ktnef_extract_all_to")), i18n("Extract All \
To..."), this);
- actionCollection()->addAction("extract_all_files", action );
+ action = new KAction(i18n("Extract"), this);
+ actionCollection()->addAction("extract_file", action );
+ connect(action, SIGNAL(triggered(bool) ), SLOT(extractFile()));
+ action = new KAction(KIcon(QString("archive-extract")), i18n("Extract To..."), \
this); + actionCollection()->addAction("extract_file_to", action );
+ connect(action, SIGNAL(triggered(bool)), SLOT(extractFileTo()));
+ action = new KAction(KIcon(QString("archive-extract-all")), i18n("Extract All \
To..."), this); + actionCollection()->addAction("extract_all_files", action );
connect(action, SIGNAL(triggered(bool)), SLOT(extractAllFiles()));
- action = new KAction(KIcon("help-contents"), i18n("Message Properties"), this);
+ action = new KAction(KIcon("help-about"), i18n("Message Properties"), this);
actionCollection()->addAction("msg_properties", action );
connect(action, SIGNAL(triggered(bool)), SLOT( slotShowMessageProperties() ));
- action = new KAction(KIcon(QString("help-contents")), i18n("Properties"), this);
+ action = new KAction(KIcon(QString("document-properties")), i18n("Properties"), \
this); actionCollection()->addAction("properties_file", action );
connect(action, SIGNAL(triggered(bool)), SLOT(propertiesFile()));
- action = new KAction(KIcon("mail"), i18n("Show Message Text"), this);
+ action = new KAction(KIcon("mail-message"), i18n("Show Message Text"), this);
actionCollection()->addAction("msg_text", action );
connect(action, SIGNAL(triggered(bool)), SLOT( slotShowMessageText() ));
action = new KAction(KIcon("document-save"), i18n("Save Message Text As..."), \
this); @@ -127,7 +127,7 @@
actionCollection()->action("properties_file")->setEnabled(false);
// Option menu
- action = new KAction(KIcon(QString("folder-open")), i18n("Default Folder..."), \
this); + action = new KAction(KIcon(QString("document-open-folder")), i18n("Default \
Folder..."), this); actionCollection()->addAction("options_default_dir", action );
connect(action, SIGNAL(triggered(bool)), SLOT(optionDefaultDir()));
@@ -348,15 +348,15 @@
if (list->count() == 1)
{
m.addAction(SmallIcon("zoom-original"), i18n("View"), this, SLOT(viewFile()));
- m.addAction(SmallIcon("package_applications"), i18n("View With..."), this, \
SLOT(viewFileAs())); + m.addAction(SmallIcon("applications-other"), i18n("View \
With..."), this, SLOT(viewFileAs())); m.addSeparator();
}
m.addAction(i18n("Extract"), this, SLOT(extractFile()));
- m.addAction(SmallIcon("ktnef_extract_to"), i18n("Extract To..."), this, \
SLOT(extractFileTo())); + m.addAction(SmallIcon("archive-extract"), i18n("Extract \
To..."), this, SLOT(extractFileTo())); if (list->count() == 1u)
{
m.addSeparator();
- m.addAction(SmallIcon("help-contents"), i18n("Properties"), this, \
SLOT(propertiesFile())); + m.addAction(SmallIcon("document-properties"), \
i18n("Properties"), this, SLOT(propertiesFile())); }
}
else if ( list->count() == 0 )
_______________________________________________
Knode-devel mailing list
Knode-devel@kde.org
https://mail.kde.org/mailman/listinfo/knode-devel
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic