|
View:
New views
1 Messages
—
Rating Filter:
Alert me
|
|
|
KDESVN commit 753724 by jpetso:
Icon naming sanity (code changes - KDE/): * connection-established -> network-connect * connect-no -> network-disconnect and other fixes. M +1 -1 kdebase/workspace/ksysguard/gui/ksysguard.cc M +6 -4 kdeedu/kstars/kstars/indidriver.cpp M +5 -5 kdelibs/kate/utils/kateglobal.cpp M +1 -1 kdelibs/kio/kio/kstatusbarofflineindicator.cpp M +6 -6 kdemultimedia/juk/playlistcollection.cpp M +2 -2 kdenetwork/kopete/protocols/jabber/jabbercontact.cpp M +5 -5 kdepim/kmobiletools/kmobiletools/libkmobiletools/devicemenu.cpp M +2 -2 kdepim/kmobiletools/kmobiletools/mainpart/servicemodel/deviceitem.cpp M +3 -3 kdesdk/scripts/qt4/adapt-to-icon-spec.py M +10 -7 kdesdk/scripts/qt4/icons-kde3tokde4-renamer/actions_rename.txt --- trunk/KDE/kdebase/workspace/ksysguard/gui/ksysguard.cc #753723:753724 @@ -134,7 +134,7 @@ mQuitAction = NULL; mMonitorRemoteAction = actionCollection()->addAction( "connect_host" ); - mMonitorRemoteAction->setIcon( KIcon("connection-established") ); + mMonitorRemoteAction->setIcon( KIcon("network-connect") ); connect(mMonitorRemoteAction, SIGNAL(triggered(bool)), SLOT( connectHost() )); mConfigureSheetAction = actionCollection()->addAction( "configure_sheet" ); --- trunk/KDE/kdeedu/kstars/kstars/indidriver.cpp #753723:753724 @@ -67,11 +67,13 @@ runningPix = KIcon( "system-run" ); stopPix = KIcon( "dialog-cancel" ); - localMode = KIcon( "cpu" ); - serverMode = KIcon( "network" ); + // jpetso: I don't know what the above icon does, depending on the usage + // it might also be "process-stop". please check back. + localMode = KIcon( "computer" ); + serverMode = KIcon( "network-server" ); - connected = KIcon( "connection-established" ); - disconnected = KIcon( "connect-no" ); + connected = KIcon( "network-connect" ); + disconnected = KIcon( "network-disconnect" ); } --- trunk/KDE/kdelibs/kate/utils/kateglobal.cpp #753723:753724 @@ -369,22 +369,22 @@ switch( number ) { case 0: - return KIcon("fileview-text"); + return KIcon("preferences-desktop-theme"); case 1: - return KIcon("color-line"); + return KIcon("preferences-desktop-color"); case 2: - return KIcon("text"); + return KIcon("accessories-text-editor"); case 3: return KIcon("document-save"); case 4: - return KIcon("go-jump-locationbar"); + return KIcon("configure-shortcuts"); case 5: - return KIcon("connection-established"); + return KIcon("network-connect"); // bad icon, please use "preferences-plugin" once available default: return KIcon("document-properties"); --- trunk/KDE/kdelibs/kio/kio/kstatusbarofflineindicator.cpp #753723:753724 @@ -49,7 +49,7 @@ layout->setMargin( 3 ); layout->setSpacing( 1 ); QLabel * label = new QLabel( this ); - label->setPixmap( SmallIcon("connect-no") ); + label->setPixmap( SmallIcon("network-disconnect") ); label->setToolTip( i18n( "The desktop is offline" ) ); layout->addWidget( label ); d->initialize(); --- trunk/KDE/kdemultimedia/juk/playlistcollection.cpp #753723:753724 @@ -869,12 +869,12 @@ menu = new KActionMenu(i18n("&Guess Tag Information"), actions()); actions()->addAction("guessTag", menu); - /* menu->setIconSet(SmallIconSet("wizard")); */ + /* menu->setIcon(SmallIcon("wizard")); */ menu->addAction(createAction(i18n("From &File Name"), SLOT(slotGuessTagFromFile()), "guessTagFile", "document-import", KShortcut(Qt::CTRL + Qt::Key_G))); menu->addAction(createAction(i18n("From &Internet"), SLOT(slotGuessTagFromInternet()), - "guessTagInternet", "connection-established", KShortcut(Qt::CTRL + Qt::Key_I))); + "guessTagInternet", "network-server", KShortcut(Qt::CTRL + Qt::Key_I))); #else createAction(i18n("Guess Tag Information From &File Name"), SLOT(slotGuessTagFromFile()), "guessTag", "file-import", KShortcut(Qt::CTRL + Qt::Key_F)); @@ -882,7 +882,7 @@ createAction(i18n("Play First Track"),SLOT(slotPlayFirst()), "playFirst"); - createAction(i18n("Play Next Album"), SLOT(slotPlayNextAlbum()), "forwardAlbum", "edit-find-next"); + createAction(i18n("Play Next Album"), SLOT(slotPlayNextAlbum()), "forwardAlbum", "go-down-search"); KStandardAction::open(this, SLOT(slotOpen()), actions()); KStandardAction::save(this, SLOT(slotSave()), actions()); @@ -902,13 +902,13 @@ menu = new KActionMenu(i18n("Cover Manager"), actions()); actions()->addAction("coverManager", menu); - /* menu->setIconSet(SmallIconSet("image")); */ + /* menu->setIcon(SmallIcon("image-x-generic")); */ menu->addAction(createAction(i18n("&View Cover"), - SLOT(slotViewCovers()), "viewCover", "zoom-original")); + SLOT(slotViewCovers()), "viewCover", "document-preview")); menu->addAction(createAction(i18n("Get Cover From &File..."), SLOT(slotAddLocalCover()), "addCover", "document-import", KShortcut(Qt::CTRL + Qt::SHIFT + Qt::Key_F))); menu->addAction(createAction(i18n("Get Cover From &Internet..."), - SLOT(slotAddInternetCover()), "webImageCover", "connection-established", KShortcut(Qt::CTRL + Qt::SHIFT + Qt::Key_G))); + SLOT(slotAddInternetCover()), "webImageCover", "network-server", KShortcut(Qt::CTRL + Qt::SHIFT + Qt::Key_G))); menu->addAction(createAction(i18n("&Delete Cover"), SLOT(slotRemoveCovers()), "removeCover", "edit-delete")); menu->addAction(createAction(i18n("Show Cover &Manager"), --- trunk/KDE/kdenetwork/kopete/protocols/jabber/jabbercontact.cpp #753723:753724 @@ -133,7 +133,7 @@ QList<KAction*> *actionCollection = new QList<KAction*>(); - KActionMenu *actionAuthorization = new KActionMenu ( KIcon("connection-established"), i18n ("Authorization"), this); + KActionMenu *actionAuthorization = new KActionMenu ( KIcon("network-connect"), i18n ("Authorization"), this); KAction *resendAuthAction, *requestAuthAction, *removeAuthAction; @@ -176,7 +176,7 @@ #undef KACTION - KActionMenu *actionSelectResource = new KActionMenu ( KIcon("connect-no"), i18n ("Select Resource"), this ); + KActionMenu *actionSelectResource = new KActionMenu ( i18n ("Select Resource"), this ); // if the contact is online, display the resources we have for it, // otherwise disable the menu --- trunk/KDE/kdepim/kmobiletools/kmobiletools/libkmobiletools/devicemenu.cpp #753723:753724 @@ -40,15 +40,15 @@ setObjectName(name); addTitle( DEVCFG(name)->deviceName() ); if(loaded) - addAction( KIcon( "connect_no" ), i18n("Unload"), this, SLOT(slotUnloadDevice()) ); - else addAction( KIcon( "connect_creating" ), i18n("Load"), this, SLOT(slotLoadDevice()) ); + addAction( KIcon( "network-disconnect" ), i18n("Unload"), this, SLOT(slotUnloadDevice()) ); + else addAction( KIcon( "network-connect" ), i18n("Load"), this, SLOT(slotLoadDevice()) ); if (!engine) - addAction( KIcon( "goto" ), i18n("Switch to.."), this, SLOT(slotSwitchDevice()) ); + addAction( KIcon( "go-jump" ), i18n("Switch to.."), this, SLOT(slotSwitchDevice()) ); else { addSeparator(); - addAction( KIcon( "personal" ), i18n("Phonebook"), this, SLOT(slotGoPhonebook()) ); - addAction( KIcon( "mail_get" ), i18n("SMS"), this, SLOT(slotGoSMS()) ); + addAction( KIcon( "user-contact" ), i18n("Phonebook"), this, SLOT(slotGoPhonebook()) ); + addAction( KIcon( "mail-receive" ), i18n("SMS"), this, SLOT(slotGoSMS()) ); } addAction( KIcon( "configure" ), i18n("Configure"), this, SLOT(slotConfigureDevice()) ); } --- trunk/KDE/kdepim/kmobiletools/kmobiletools/mainpart/servicemodel/deviceitem.cpp #753723:753724 @@ -80,14 +80,14 @@ setFont( QFont() ); m_connectDeviceAction->setEnabled( false ); m_disconnectDeviceAction->setEnabled( true ); - setIcon( KIcon( "connection-established" ) ); + setIcon( KIcon( "network-connect" ) ); } void DeviceItem::deviceDisconnected() { setFont( QFont() ); m_connectDeviceAction->setEnabled( true ); m_disconnectDeviceAction->setEnabled( false ); - setIcon( KIcon( "connect-no" ) ); + setIcon( KIcon( "network-disconnect" ) ); } #include "deviceitem.moc" --- trunk/KDE/kdesdk/scripts/qt4/adapt-to-icon-spec.py #753723:753724 @@ -28,8 +28,7 @@ ('color-picker', 'colorpicker'), ('configure-shortcuts', 'configure_shortcuts'), ('configure-toolbars', 'configure_toolbars'), - ('connection-established', 'connect_established'), - ('contact', 'identity'), + ('user-identity', 'identity'), ('dialog-ok-apply', 'apply'), ('dialog-cancel', 'button_cancel'), ('dialog-error', 'messagebox_critical'), @@ -122,6 +121,8 @@ ('kdeprint-addprinter', 'kdeprint_addprinter'), ('kdeprint-printer-infos', 'kdeprint_printer_infos'), ('kdeprint-testprinter', 'kdeprint_testprinter'), + ('network-connect', 'connect_established'), + ('network-disconnect', 'connect_no'), ('none', 'kdeprint_configmgr'), ('none', 'kdeprint_configsrv'), ('none', 'kdeprint_defaulthard'), @@ -137,7 +138,6 @@ ('printer-queue-state', 'kdeprint_queuestate'), ('process-stop', 'stop'), ('run-build', 'make_kdevelop'), - ('run-build', 'make-kdevelop'), ('run-build-file', 'compfile'), ('search-filter', 'filter'), ('show-menu', 'showmenu'), --- trunk/KDE/kdesdk/scripts/qt4/icons-kde3tokde4-renamer/actions_rename.txt #753723:753724 @@ -1,8 +1,11 @@ about_kde -help-about-kde +kde about-kde +kde + help-about-kde +kde 1downarrow arrow-down @@ -35,25 +38,25 @@ archive-remove ark_extract -ark-extract +archive-extract ark-extract archive-extract ark_adddir -ark-adddir +archive-insert-directory ark-adddir archive-insert-directory ark_addfile -ark-addfile +archive-insert ark-addfile archive-insert ark_view -ark-view +document-preview-archive ark-view document-preview-archive @@ -95,10 +98,10 @@ leftjust connect_established -network-connected +network-connect connect_no -network-disconnected +network-disconnect cancel dialog-cancel _______________________________________________ kmobiletools mailing list kmobiletools@... https://mail.kde.org/mailman/listinfo/kmobiletools |
| Free embeddable forum powered by Nabble | Forum Help |