diff options
author | Timothy Pearson <[email protected]> | 2014-10-13 15:43:49 -0500 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2014-10-13 15:43:49 -0500 |
commit | 2e060b38699ff1a15b4ed532833c5ab0f75f60a7 (patch) | |
tree | 7f04601311be438b4c8f5159055e9a4fe889f9df | |
parent | b18099fab78b7ab3db60d24b7d0657699b6320ee (diff) | |
download | krusader-2e060b38699ff1a15b4ed532833c5ab0f75f60a7.tar.gz krusader-2e060b38699ff1a15b4ed532833c5ab0f75f60a7.zip |
Bring filenew, fileopen, fileprint, filequickprint, filesave, filesaveas, fileclose, editclear, editcopy, editcut, editdelete, editpaste, folder_new, and gohome icons into XDG compliance
-rw-r--r-- | krusader/ActionMan/actionproperty.cpp | 2 | ||||
-rw-r--r-- | krusader/ActionMan/addplaceholderpopup.cpp | 4 | ||||
-rw-r--r-- | krusader/ActionMan/useractionpage.cpp | 8 | ||||
-rw-r--r-- | krusader/BookMan/krbookmarkhandler.cpp | 4 | ||||
-rw-r--r-- | krusader/Dialogs/krprogress.cpp | 4 | ||||
-rw-r--r-- | krusader/Dialogs/packguibase.cpp | 2 | ||||
-rw-r--r-- | krusader/DiskUsage/diskusagegui.cpp | 2 | ||||
-rw-r--r-- | krusader/DiskUsage/radialMap/widgetEvents.cpp | 6 | ||||
-rw-r--r-- | krusader/KViewer/krviewer.cpp | 4 | ||||
-rw-r--r-- | krusader/Konfigurator/konfiguratoritems.cpp | 4 | ||||
-rw-r--r-- | krusader/Panel/panelpopup.cpp | 2 | ||||
-rw-r--r-- | krusader/krusader.cpp | 6 |
12 files changed, 24 insertions, 24 deletions
diff --git a/krusader/ActionMan/actionproperty.cpp b/krusader/ActionMan/actionproperty.cpp index 5761c84..ea77420 100644 --- a/krusader/ActionMan/actionproperty.cpp +++ b/krusader/ActionMan/actionproperty.cpp @@ -44,7 +44,7 @@ ActionProperty::ActionProperty( TQWidget *parent, const char *name, KrAction *ac } ButtonAddPlaceholder->setPixmap( ICON("add") ); - ButtonAddStartpath->setPixmap( ICON("fileopen") ); + ButtonAddStartpath->setPixmap( ICON("document-open") ); // fill with all existing categories cbCategory->insertStringList( krUserAction->allCategories() ); diff --git a/krusader/ActionMan/addplaceholderpopup.cpp b/krusader/ActionMan/addplaceholderpopup.cpp index ef58895..b0db5b7 100644 --- a/krusader/ActionMan/addplaceholderpopup.cpp +++ b/krusader/ActionMan/addplaceholderpopup.cpp @@ -346,7 +346,7 @@ ParameterFile::ParameterFile( const exp_parameter& parameter, TQWidget* parent ) _lineEdit = new KLineEdit( hbox ); _button = new TQToolButton( hbox); TDEIconLoader *iconLoader = new TDEIconLoader(); - _button->setPixmap( iconLoader->loadIcon( "fileopen", TDEIcon::Toolbar, 16 ) ); + _button->setPixmap( iconLoader->loadIcon( "document-open", TDEIcon::Toolbar, 16 ) ); connect( _button, TQT_SIGNAL(clicked()), this, TQT_SLOT(addFile()) ); } @@ -439,7 +439,7 @@ ParameterGoto::ParameterGoto( const exp_parameter& parameter, TQWidget* parent ) _lineEdit->setCompletionObject( new KURLCompletion( KURLCompletion::DirCompletion ) ); _dirButton = new TQToolButton( hbox ); TDEIconLoader *iconLoader = new TDEIconLoader(); - _dirButton->setPixmap( iconLoader->loadIcon( "fileopen", TDEIcon::Toolbar, 16 ) ); + _dirButton->setPixmap( iconLoader->loadIcon( "document-open", TDEIcon::Toolbar, 16 ) ); connect( _dirButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(setDir()) ); _placeholderButton = new TQToolButton( hbox); _placeholderButton->setText( i18n("add") ); diff --git a/krusader/ActionMan/useractionpage.cpp b/krusader/ActionMan/useractionpage.cpp index c7beede..fc976b7 100644 --- a/krusader/ActionMan/useractionpage.cpp +++ b/krusader/ActionMan/useractionpage.cpp @@ -43,7 +43,7 @@ UserActionPage::UserActionPage( TQWidget* parent ) TQHBoxLayout* toolbarLayout = new TQHBoxLayout( layout, 0, 0 ); // neither margin nor spacing for the toolbar with autoRaise newButton = new TQToolButton( this, "newButton" ); - newButton->setPixmap( ICON("filenew") ); + newButton->setPixmap( ICON("document-new") ); newButton->setAutoRaise(true); TQToolTip::add( newButton, i18n("Create new useraction") ); @@ -58,17 +58,17 @@ UserActionPage::UserActionPage( TQWidget* parent ) TQToolTip::add( exportButton, i18n("Export useractions") ); copyButton = new TQToolButton( this, "copyButton" ); - copyButton->setPixmap( ICON("editcopy") ); + copyButton->setPixmap( ICON("edit-copy") ); copyButton->setAutoRaise(true); TQToolTip::add( copyButton, i18n("Copy useractions to clipboard") ); pasteButton = new TQToolButton( this, "pasteButton" ); - pasteButton->setPixmap( ICON("editpaste") ); + pasteButton->setPixmap( ICON("edit-paste") ); pasteButton->setAutoRaise(true); TQToolTip::add( pasteButton, i18n("Paste useractions from clipboard") ); removeButton = new TQToolButton( this, "removeButton" ); - removeButton->setPixmap( ICON("editdelete") ); + removeButton->setPixmap( ICON("edit-delete") ); removeButton->setAutoRaise(true); TQToolTip::add( removeButton, i18n("Delete selected useractions") ); diff --git a/krusader/BookMan/krbookmarkhandler.cpp b/krusader/BookMan/krbookmarkhandler.cpp index f9cafbe..fb52e3a 100644 --- a/krusader/BookMan/krbookmarkhandler.cpp +++ b/krusader/BookMan/krbookmarkhandler.cpp @@ -535,10 +535,10 @@ void KrBookmarkHandler::rightClickOnSpecialBookmark() { void KrBookmarkHandler::rightClicked( TQPopupMenu *menu, int /*id*/, KrBookmark * bm ) { TQPopupMenu popup( _mainBookmarkPopup ); - popup.insertItem( krLoader->loadIcon( "fileopen", TDEIcon::Panel ), i18n( "Open" ), OPEN_ID ); + popup.insertItem( krLoader->loadIcon( "document-open", TDEIcon::Panel ), i18n( "Open" ), OPEN_ID ); popup.insertItem( krLoader->loadIcon( "tab_new", TDEIcon::Panel ), i18n( "Open in a new tab" ), OPEN_NEW_TAB_ID ); popup.insertSeparator(); - popup.insertItem( krLoader->loadIcon( "editdelete", TDEIcon::Panel ), i18n( "Delete" ), DELETE_ID ); + popup.insertItem( krLoader->loadIcon( "edit-delete", TDEIcon::Panel ), i18n( "Delete" ), DELETE_ID ); connect( menu, TQT_SIGNAL( highlighted( int ) ), &popup, TQT_SLOT( close() ) ); connect( menu, TQT_SIGNAL( activated( int ) ), &popup, TQT_SLOT( close() ) ); diff --git a/krusader/Dialogs/krprogress.cpp b/krusader/Dialogs/krprogress.cpp index ddbdf25..4c6b1f6 100644 --- a/krusader/Dialogs/krprogress.cpp +++ b/krusader/Dialogs/krprogress.cpp @@ -44,8 +44,8 @@ KrProgress::KrProgress( TDEIO::Job* job ) #ifdef TQ_WS_X11 //FIXME(E): Remove once all the KWin::foo calls have been ported to TQWS // Set a useful icon for this window! KWin::setIcons( winId(), - TDEGlobal::iconLoader()->loadIcon( "filesave", TDEIcon::NoGroup, 32 ), - TDEGlobal::iconLoader()->loadIcon( "filesave", TDEIcon::NoGroup, 16 ) ); + TDEGlobal::iconLoader()->loadIcon( "document-save", TDEIcon::NoGroup, 32 ), + TDEGlobal::iconLoader()->loadIcon( "document-save", TDEIcon::NoGroup, 16 ) ); #endif TQVBoxLayout *topLayout = new TQVBoxLayout( this, KDialog::marginHint(), diff --git a/krusader/Dialogs/packguibase.cpp b/krusader/Dialogs/packguibase.cpp index 699b987..d79897d 100644 --- a/krusader/Dialogs/packguibase.cpp +++ b/krusader/Dialogs/packguibase.cpp @@ -101,7 +101,7 @@ PackGUIBase::PackGUIBase( TQWidget* parent, const char* name, bool modal, WFlag hbox_2->addWidget( dirData ); browseButton = new TQToolButton( this, "browseButton" ); - browseButton->setIconSet( SmallIcon( "fileopen" ) ); + browseButton->setIconSet( SmallIcon( "document-open" ) ); hbox_2->addWidget( browseButton ); TQSpacerItem* spacer = new TQSpacerItem( 48, 20, TQSizePolicy::Fixed, TQSizePolicy::Fixed ); hbox_2->addItem( spacer ); diff --git a/krusader/DiskUsage/diskusagegui.cpp b/krusader/DiskUsage/diskusagegui.cpp index b4814ca..513f171 100644 --- a/krusader/DiskUsage/diskusagegui.cpp +++ b/krusader/DiskUsage/diskusagegui.cpp @@ -56,7 +56,7 @@ DiskUsageGUI::DiskUsageGUI( KURL openDir, TQWidget* parent, const char *name ) duTools->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ); btnNewSearch = new TQToolButton( duTools, "btnNewSearch" ); - btnNewSearch->setIconSet( TQIconSet(krLoader->loadIcon("fileopen",TDEIcon::Desktop)) ); + btnNewSearch->setIconSet( TQIconSet(krLoader->loadIcon("document-open",TDEIcon::Desktop)) ); TQToolTip::add( btnNewSearch, i18n( "Start new disk usage search" ) ); btnRefresh = new TQToolButton( duTools, "btnRefresh" ); diff --git a/krusader/DiskUsage/radialMap/widgetEvents.cpp b/krusader/DiskUsage/radialMap/widgetEvents.cpp index 129581f..847bd1c 100644 --- a/krusader/DiskUsage/radialMap/widgetEvents.cpp +++ b/krusader/DiskUsage/radialMap/widgetEvents.cpp @@ -166,10 +166,10 @@ RadialMap::Widget::mousePressEvent( TQMouseEvent *e ) popup.insertItem( SmallIconSet( "viewmag" ), i18n( "&Center Map Here" ), 2 ); } } - else popup.insertItem( SmallIconSet( "fileopen" ), i18n( "&Open" ), 3 ); + else popup.insertItem( SmallIconSet( "document-open" ), i18n( "&Open" ), 3 ); popup.insertSeparator(); - popup.insertItem( SmallIconSet( "editdelete" ), i18n( "&Delete" ), 4 ); + popup.insertItem( SmallIconSet( "edit-delete" ), i18n( "&Delete" ), 4 ); switch( popup.exec( e->globalPos(), 1 ) ) { case 0: @@ -191,7 +191,7 @@ RadialMap::Widget::mousePressEvent( TQMouseEvent *e ) const TQString message = ( m_focus->file()->isDir() ? i18n( "<qt>The directory at <i>'%1'</i> will be <b>recursively</b> and <b>permanently</b> deleted!</qt>" ) : i18n( "<qt><i>'%1'</i> will be <b>permanently</b> deleted!</qt>" )).arg( url.prettyURL() ); - const int userIntention = KMessageBox::warningContinueCancel( this, message, TQString(), KGuiItem( i18n("&Delete"), "editdelete" ) ); + const int userIntention = KMessageBox::warningContinueCancel( this, message, TQString(), KGuiItem( i18n("&Delete"), "edit-delete" ) ); if( userIntention == KMessageBox::Continue ) { TDEIO::Job *job = TDEIO::del( url ); diff --git a/krusader/KViewer/krviewer.cpp b/krusader/KViewer/krviewer.cpp index 5301ce3..15e76e0 100644 --- a/krusader/KViewer/krviewer.cpp +++ b/krusader/KViewer/krviewer.cpp @@ -47,7 +47,7 @@ #define VIEW_ICON "viewmag" #define EDIT_ICON "edit" -#define MODIFIED_ICON "filesaveas" +#define MODIFIED_ICON "document-save-as" TQPtrList<KrViewer> KrViewer::viewers; @@ -75,7 +75,7 @@ KParts::MainWindow( parent, name ), manager( this, TQT_TQOBJECT(this) ), tabBar( tabBar.setAutomaticResizeTabs(true); #endif // "edit" -// "filesaveas" +// "document-save-as" setCentralWidget( &tabBar ); printAction = KStdAction::print( TQT_TQOBJECT(this), TQT_SLOT( print() ), 0, 0 ); diff --git a/krusader/Konfigurator/konfiguratoritems.cpp b/krusader/Konfigurator/konfiguratoritems.cpp index e83315a..898917e 100644 --- a/krusader/Konfigurator/konfiguratoritems.cpp +++ b/krusader/Konfigurator/konfiguratoritems.cpp @@ -351,7 +351,7 @@ KonfiguratorURLRequester::KonfiguratorURLRequester( TQString cls, TQString name, connect( TQT_TQOBJECT(this), TQT_SIGNAL( textChanged(const TQString &) ), ext, TQT_SLOT( setChanged() ) ); - button()->setIconSet( SmallIcon( "fileopen" ) ); + button()->setIconSet( SmallIcon( "document-open" ) ); loadInitialValue(); } @@ -397,7 +397,7 @@ KonfiguratorFontChooser::KonfiguratorFontChooser( TQString cls, TQString name, T connect( pToolButton, TQT_SIGNAL( clicked() ), TQT_TQOBJECT(this), TQT_SLOT( slotBrowseFont() ) ); - pToolButton->setIconSet( SmallIcon( "fileopen" ) ); + pToolButton->setIconSet( SmallIcon( "document-open" ) ); loadInitialValue(); } diff --git a/krusader/Panel/panelpopup.cpp b/krusader/Panel/panelpopup.cpp index ff393b2..5a6a35d 100644 --- a/krusader/Panel/panelpopup.cpp +++ b/krusader/Panel/panelpopup.cpp @@ -174,7 +174,7 @@ PanelPopup::PanelPopup( TQSplitter *parent, bool left ) : TQWidget( parent ), connect(qselectBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(quickSelect())); TQToolButton *qstoreBtn = new TQToolButton(quickPanel); - qstoreBtn->setPixmap(krLoader->loadIcon( "filesave", TDEIcon::Toolbar, 16 )); + qstoreBtn->setPixmap(krLoader->loadIcon( "document-save", TDEIcon::Toolbar, 16 )); qstoreBtn->setFixedSize(20, 20); TQToolTip::add( qstoreBtn, i18n("store the current selection") ); connect(qstoreBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(quickSelectStore())); diff --git a/krusader/krusader.cpp b/krusader/krusader.cpp index 510f556..0a1d94e 100644 --- a/krusader/krusader.cpp +++ b/krusader/krusader.cpp @@ -590,7 +590,7 @@ void Krusader::setupActions() { TQT_SLOT( cmdlinePopup() ), actionCollection(), "cmdline popup" ); /* Shortcut disabled because of the Terminal Emulator bug. */ actDirUp = new TDEAction( i18n( "Up" ), "go-up", CTRL+Key_PageUp /*Key_Backspace*/, SLOTS, TQT_SLOT( dirUp() ), actionCollection(), "dirUp" ); - new TDEAction( i18n( "&New Text File..." ), "filenew", SHIFT + Key_F4, SLOTS, TQT_SLOT( editDlg() ), actionCollection(), "edit_new_file" ); + new TDEAction( i18n( "&New Text File..." ), "document-new", SHIFT + Key_F4, SLOTS, TQT_SLOT( editDlg() ), actionCollection(), "edit_new_file" ); new TDEAction( i18n( "Start &Root Mode Krusader" ), "krusader_root", ALT + Key_K, SLOTS, TQT_SLOT( rootKrusader() ), actionCollection(), "root krusader" ); actTest = new TDEAction( i18n( "T&est Archive" ), "ark", ALT + Key_E, @@ -776,9 +776,9 @@ void Krusader::setupActions() { SLOTS, TQT_SLOT( copyFiles() ) , actionCollection(), "F5_Copy" ); actF6 = new TDEAction( i18n( "Move..." ), Key_F6, SLOTS, TQT_SLOT( moveFiles() ) , actionCollection(), "F6_Move" ); - actF7 = new TDEAction( i18n( "New Directory..." ), "folder_new", Key_F7, + actF7 = new TDEAction( i18n( "New Directory..." ), "folder-new", Key_F7, SLOTS, TQT_SLOT( mkdir() ) , actionCollection(), "F7_Mkdir" ); - actF8 = new TDEAction( i18n( "Delete" ), "editdelete", Key_F8, + actF8 = new TDEAction( i18n( "Delete" ), "edit-delete", Key_F8, SLOTS, TQT_SLOT( deleteFiles() ) , actionCollection(), "F8_Delete" ); actF9 = new TDEAction( i18n( "Rename" ), Key_F9, SLOTS, TQT_SLOT( rename() ) , actionCollection(), "F9_Rename" ); |