KDE

View: New views

1 Messages — Rating Filter: Alert me

KDE

by Bugzilla from jpetso@gmx.at :: Rate this Message:

Reply to Author | View Threaded | Show Only this Message

SVN commit 755605 by jpetso:

Icon naming spec compliance (code changes - KDE/):
* remove the dreaded "gear" icon, mostly replaced by system-run
(which doesn't make a perfect fit all of the time,
but starting from "gear" it can't get worse)
* remove actions/help-about-kde, in favor of apps/kde

M +1 -1 kdeadmin/kcron/ktlisttask.cpp
M +1 -1 kdebase/workspace/kcontrol/style/menupreview.cpp
M +2 -2 kdeedu/kalzium/src/kalzium.cpp
M +2 -2 kdeedu/kig/kig/kig_part.cpp
M +1 -1 kdeedu/kig/misc/lists.cc
M +1 -1 kdeedu/kig/misc/object_constructor.cc
M +1 -1 kdeedu/kig/modes/edittype.cc
M +1 -1 kdeedu/kig/modes/macrowizard.cc
M +2 -2 kdelibs/kdeui/widgets/khelpmenu.cpp
M +1 -1 kdelibs/khtml/ecma/debugger/errordlg.cpp
M +1 -1 kdelibs/khtml/ecma/kjs_debugwin.cpp
M +1 -1 kdepim/kmail/kmfilter.cpp
M +1 -1 kdepim/kmail/kmfilterdlg.cpp
M +9 -8 kdepim/kmobiletools/kmobiletools/mainpart/statusbar.cpp
M +2 -2 kdepim/ktimetracker/timetrackerwidget.cpp
M +1 -2 kdesdk/scripts/qt4/adapt-to-icon-spec.py
M +1 -1 kdevelop/languages/cpp/debugger/disassemblewidget.cpp

--- trunk/KDE/kdeadmin/kcron/ktlisttask.cpp #755604:755605
@@ -64,7 +64,7 @@
// using KIconLoader() instead of getMaxIcon() because we need a null pixmap if pixmap cannot be found
KIconLoader *loader = KIconLoader::global();
QPixmap qpIcon(loader->loadIcon(qsCommand, KIconLoader::Small, 0, KIconLoader::DefaultState, QStringList(), 0L, true));
- if (qpIcon.isNull()) qpIcon = KTIcon::getMiniIcon("gear");
+ if (qpIcon.isNull()) qpIcon = KTIcon::getMiniIcon("system-run");
setPixmap(0, qpIcon);
}

--- trunk/KDE/kdebase/workspace/kcontrol/style/menupreview.cpp #755604:755605
@@ -83,7 +83,7 @@
((y % 2) ? c2 : c1 ) : // See the grid? ;-)
((y % 2) ? c1 : c2 ) );
KIconLoader* icl = KIconLoader::global();
- QPixmap pix = icl->loadIcon("help-about-kde", KIconLoader::Desktop, KIconLoader::SizeLarge, KIconLoader::ActiveState);
+ QPixmap pix = icl->loadIcon("kde", KIconLoader::Desktop, KIconLoader::SizeLarge, KIconLoader::ActiveState);
p.drawPixmap( (width()-2-pix.width())/2, (height()-2-pix.height())/2, pix );
}

--- trunk/KDE/kdeedu/kalzium/src/kalzium.cpp #755604:755605
@@ -550,13 +550,13 @@
QWidget *w_units = new QWidget( 0 );
w_units->setObjectName( "units_page" );
ui_units.setupUi( w_units );
- dialog->addPage( w_units, i18n( "Units" ), "gear" );
+ dialog->addPage( w_units, i18n( "Units" ), "system-run" );
// misc page
Ui_setupMisc ui_misc;
QWidget *w_misc = new QWidget( 0 );
w_misc->setObjectName( "miscpage" );
ui_misc.setupUi( w_misc );
- dialog->addPage( w_misc, i18n( "Miscellaneous" ), "misc" );
+ dialog->addPage( w_misc, i18n( "Miscellaneous" ), "preferences-other" );
// showing the dialog
dialog->show();
}
--- trunk/KDE/kdeedu/kig/kig/kig_part.cpp #755604:755605
@@ -243,7 +243,7 @@
i18n("Cancel the construction of the object being constructed"));
aCancelConstruction->setEnabled(false);

- aRepeatLastConstruction = new KAction(KIcon("gear"), i18n("Repeat Construction"), this);
+ aRepeatLastConstruction = new KAction(KIcon("system-run"), i18n("Repeat Construction"), this);
actionCollection()->addAction("repeat_last_construction", aRepeatLastConstruction );
connect(aRepeatLastConstruction, SIGNAL(triggered(bool) ), SLOT(repeatLastConstruction()));
aRepeatLastConstruction->setShortcut(QKeySequence(Qt::Key_Z));
@@ -257,7 +257,7 @@
aShowHidden->setToolTip(i18n("Show all hidden objects"));
aShowHidden->setEnabled( true );

- aNewMacro = new KAction(KIcon("gear"), i18n("&New Macro..."), this);
+ aNewMacro = new KAction(KIcon("system-run"), i18n("&New Macro..."), this);
actionCollection()->addAction("macro_action", aNewMacro );
connect(aNewMacro, SIGNAL(triggered(bool) ), SLOT(newMacro()));
aNewMacro->setToolTip(i18n("Define a new macro"));
--- trunk/KDE/kdeedu/kig/misc/lists.cc #755604:755605
@@ -351,7 +351,7 @@
QString name, description;
ObjectHierarchy* hierarchy = 0;
QByteArray actionname;
- QByteArray iconfile( "gear" );
+ QByteArray iconfile( "system-run" );
if ( macroelem.tagName() != "Macro" ) continue; // forward compat ?
for ( QDomElement dataelem = macroelem.firstChild().toElement();
! dataelem.isNull(); dataelem = dataelem.nextSibling().toElement() )
--- trunk/KDE/kdeedu/kig/misc/object_constructor.cc #755604:755605
@@ -382,7 +382,7 @@

const QByteArray MacroConstructor::iconFileName( const bool canBeNull ) const
{
- return ( miconfile.isNull() && !canBeNull ) ? QByteArray( "gear" ) : miconfile;
+ return ( miconfile.isNull() && !canBeNull ) ? QByteArray( "system-run" ) : miconfile;
}

bool MacroConstructor::isAlreadySelectedOK( const std::vector<ObjectCalcer*>&, const int& ) const
--- trunk/KDE/kdeedu/kig/modes/edittype.cc #755604:755605
@@ -52,7 +52,7 @@
i18n( "Here you can edit the description of the current macro type. "
"This field is optional, so you can also leave this empty: if "
"you do so, then your macro type will have no description." ) );
- medittypewidget->typeIcon->setIcon( !micon.isEmpty() ? micon : "gear" );
+ medittypewidget->typeIcon->setIcon( !micon.isEmpty() ? micon : "system-run" );
medittypewidget->typeIcon->setWhatsThis(
i18n( "Use this button to change the icon of the current macro type." ) );

--- trunk/KDE/kdeedu/kig/modes/macrowizard.cc #755604:755605
@@ -157,7 +157,7 @@
KIconButton* iconbutton = new KIconButton( this );
iconlay->addWidget( iconbutton );
label->setBuddy( iconbutton );
- iconbutton->setIcon( "gear" );
+ iconbutton->setIcon( "system-run" );
iconlay->addItem( new QSpacerItem( 5, 5, QSizePolicy::Expanding, QSizePolicy::Fixed ) );

registerField( "name*", editname );
--- trunk/KDE/kdelibs/kdeui/widgets/khelpmenu.cpp #755604:755605
@@ -159,7 +159,7 @@

if( d->mShowWhatsThis && KAuthorized::authorizeKAction("help_whats_this") )
{
- d->mWhatsThisAction = new KAction(KIcon("help-whatsthis"), i18n( "What's &This" ), d->mMenu);
+ d->mWhatsThisAction = new KAction(KIcon("help-contextual"), i18n( "What's &This" ), d->mMenu);
d->mWhatsThisAction->setShortcut(Qt::SHIFT + Qt::Key_F1);
connect(d->mWhatsThisAction, SIGNAL(triggered(bool)), this, SLOT(contextHelpActivated()));
need_separator = true;
@@ -192,7 +192,7 @@

if (KAuthorized::authorizeKAction("help_about_kde"))
{
- d->mAboutKDEAction = d->mMenu->addAction( KIcon("help-about-kde"), i18n( "About &KDE" ), this, SLOT( aboutKDE() ) );
+ d->mAboutKDEAction = d->mMenu->addAction( KIcon("kde"), i18n( "About &KDE" ), this, SLOT( aboutKDE() ) );
}
}

--- trunk/KDE/kdelibs/khtml/ecma/debugger/errordlg.cpp #755604:755605
@@ -35,7 +35,7 @@
setCaption( i18n("JavaScript Error") );
setModal( true );
setButtons( showDebug ? KDialog::Ok | KDialog::User1 : KDialog::Ok );
- setButtonGuiItem( KDialog::User1, KGuiItem("&Debug","gear") );
+ setButtonGuiItem( KDialog::User1, KGuiItem("&Debug","system-run") );
setDefaultButton( KDialog::Ok );
showButtonSeparator( false );

--- trunk/KDE/kdelibs/khtml/ecma/kjs_debugwin.cpp #755604:755605
@@ -298,7 +298,7 @@
setCaption( i18n("JavaScript Error") );
setModal( true );
setButtons( showDebug ? KDialog::Ok | KDialog::User1 : KDialog::Ok );
- setButtonGuiItem( KDialog::User1, KGuiItem("&Debug","gear") );
+ setButtonGuiItem( KDialog::User1, KGuiItem("&Debug","system-run") );
setDefaultButton( KDialog::Ok );
showButtonSeparator( false );

--- trunk/KDE/kdepim/kmail/kmfilter.cpp #755604:755605
@@ -264,7 +264,7 @@
bConfigureToolbar = config.readEntry( "ConfigureToolbar", false );
bConfigureToolbar = bConfigureToolbar && bConfigureShortcut;
mToolbarName = config.readEntry( "ToolbarName", name() );
- mIcon = config.readEntry( "Icon", "gear" );
+ mIcon = config.readEntry( "Icon", "system-run" );
bAutoNaming = config.readEntry( "AutomaticName", false );

int i, numActions;
--- trunk/KDE/kdepim/kmail/kmfilterdlg.cpp #755604:755605
@@ -261,7 +261,7 @@
mFilterActionLabel->setBuddy( mFilterActionIconButton );
mFilterActionIconButton->setIconType( KIconLoader::NoGroup, KIconLoader::Action, false );
mFilterActionIconButton->setIconSize( 16 );
- mFilterActionIconButton->setIcon( "gear" );
+ mFilterActionIconButton->setIcon( "system-run" );
mFilterActionIconButton->setEnabled( false );

gl->addWidget( hbox, 9, 0, 1, 4 );
--- trunk/KDE/kdepim/kmobiletools/kmobiletools/mainpart/statusbar.cpp #755604:755605
@@ -36,8 +36,8 @@
#include <qapplication.h>
#include <qlayout.h>

-#define PIX_UP KIcon( "up" )
-#define PIX_DOWN KIcon( "down" )
+#define PIX_UP KIcon( "go-up" )
+#define PIX_DOWN KIcon( "go-down" )

StatusBarScrollView::StatusBarScrollView(QWidget *parent, const char *name, Qt::WFlags f)
: Q3ScrollView(parent, name, f)
@@ -215,26 +215,27 @@
QLabel *iconLabel=new QLabel(this);
switch( jobType ){
case KMobileTools::Job::initPhone:
- s_itemLabelName="connect_creating"; break;
+ s_itemLabelName="network-connect"; break;
+ // should be network-connecting, however that doesn't exist in KDE 4.0 yet
case KMobileTools::Job::fetchSMS:
case KMobileTools::Job::selectSMSSlot:
case KMobileTools::Job::smsFolders:
case KMobileTools::Job::sendStoredSMS:
- s_itemLabelName="mail_generic"; break;
+ s_itemLabelName="mail-message"; break;
case KMobileTools::Job::sendSMS:
case KMobileTools::Job::storeSMS:
- s_itemLabelName="mail_forward"; break;
+ s_itemLabelName="mail-forward"; break;
case KMobileTools::Job::delAddressee:
case KMobileTools::Job::addAddressee:
case KMobileTools::Job::editAddressee:
case KMobileTools::Job::fetchAddressBook:
- s_itemLabelName="kontact_contacts"; break;
+ s_itemLabelName="view-pim-contacts"; break;
case KMobileTools::Job::syncDateTimeJob:
s_itemLabelName="kalarm"; break;
case KMobileTools::Job::testPhoneFeatures:
- s_itemLabelName="gear"; break;
+ s_itemLabelName="system-run"; break;
case KMobileTools::Job::fetchKCal:
- s_itemLabelName="date"; break;
+ s_itemLabelName="office-calendar"; break;
default:
s_itemLabelName="kmobiletools"; break;
}
--- trunk/KDE/kdepim/ktimetracker/timetrackerwidget.cpp #755604:755605
@@ -619,7 +619,7 @@
Ui::BehaviorPage *behaviorUi = new Ui::BehaviorPage;
QWidget *behaviorPage = new QWidget;
behaviorUi->setupUi( behaviorPage );
- dialog->addPage( behaviorPage, i18n( "Behavior" ), "gear" );
+ dialog->addPage( behaviorPage, i18n( "Behavior" ), "preferences-other" );

Ui::DisplayPage *displayUi = new Ui::DisplayPage;
QWidget *displayPage = new QWidget;
@@ -627,7 +627,7 @@
dialog->addPage( displayPage,
i18nc( "settings page for customizing user interface",
"Appearance" ),
- "preferences-desktop-default-applications" );
+ "preferences-desktop-theme" );

Ui::StoragePage *storageUi = new Ui::StoragePage;
QWidget *storagePage = new QWidget;
--- trunk/KDE/kdesdk/scripts/qt4/adapt-to-icon-spec.py #755604:755605
@@ -88,8 +88,6 @@
('go-up', 'up'),
('go-jump', 'goto'),
('go-jump', 'goto-page'),
- ('help-about-kde', 'about_kde'),
- ('help-about-kde', 'about-kde'),
('help-contents', 'contents'),
('help-contents', 'help'),
('help-contextual', 'contexthelp'),
@@ -118,6 +116,7 @@
('media-seek-forward', 'player_fwd'),
('media-skip-backward', 'player_start'),
('media-skip-forward', 'player_end'),
+ ('kde', 'about_kde'),
('kdeprint-addprinter', 'kdeprint_addprinter'),
('kdeprint-printer-infos', 'kdeprint_printer_infos'),
('kdeprint-testprinter', 'kdeprint_testprinter'),
--- trunk/KDE/kdevelop/languages/cpp/debugger/disassemblewidget.cpp #755604:755605
@@ -61,7 +61,7 @@
"instruction using the debuggers toolbar "
"buttons of \"step over\" instruction and "
"\"step into\" instruction."));
- setWindowIcon( KIcon("gear") );
+ setWindowIcon( KIcon("system-run") );
setWindowTitle(i18n("Disassemble View"));
setFont(KGlobalSettings::fixedFont());
setSelectionMode(SingleSelection);
_______________________________________________
kmobiletools mailing list
kmobiletools@...
https://mail.kde.org/mailman/listinfo/kmobiletools