From a9fe8ed4fcf26c0244d607aa36b0a7d0fd859718 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sun, 11 Apr 2021 19:48:22 +0900 Subject: Revert "Use new icons in tdelibs". This is because krename icon is an application icon and not an action one. This reverts commit 3fd5921381db2bf344aef7216415fae2d6b67e76a. (cherry picked from commit d9b8fe2454fb4bbf2c63ca314434b4816cca3bb7) --- krename/ProgressDialog.cpp | 2 +- krename/batchrenamer.cpp | 2 +- krename/confdialog.cpp | 2 +- krename/hi32-app-krename.png | Bin 0 -> 624 bytes krename/hi48-app-krename.png | Bin 0 -> 545 bytes krename/krename.desktop | 4 ++-- krename/krename_dir.desktop | 2 +- krename/krenameimpl.cpp | 4 ++-- krename/krenameservicemenu.desktop | 2 +- krename/lo16-app-krename.png | Bin 0 -> 377 bytes krename/lo32-app-krename.png | Bin 0 -> 624 bytes krename/tabs.cpp | 2 +- krename/wizard.cpp | 2 +- 13 files changed, 11 insertions(+), 11 deletions(-) create mode 100644 krename/hi32-app-krename.png create mode 100644 krename/hi48-app-krename.png create mode 100644 krename/lo16-app-krename.png create mode 100644 krename/lo32-app-krename.png diff --git a/krename/ProgressDialog.cpp b/krename/ProgressDialog.cpp index f254486..a7812aa 100644 --- a/krename/ProgressDialog.cpp +++ b/krename/ProgressDialog.cpp @@ -51,7 +51,7 @@ ProgressDialog::ProgressDialog( TQWidget* parent, const char* name, WFlags fl ) resize( 400, 380 ); setCaption( i18n("Progress") ); - setIcon( BarIcon( "edit_rename" ) ); + setIcon( BarIcon( "krename" ) ); ProgressDialogLayout = new TQVBoxLayout( this, 11, 6 ); Layout1 = new TQHBoxLayout( 0, 0, 6 ); diff --git a/krename/batchrenamer.cpp b/krename/batchrenamer.cpp index 06a83d3..bfebf35 100644 --- a/krename/batchrenamer.cpp +++ b/krename/batchrenamer.cpp @@ -336,7 +336,7 @@ void BatchRenamer::work( ProgressDialog* p ) p->warning(i18n("%2 errors occurred!").arg(error)); p->print(i18n("Elapsed time: %1 seconds").arg( t.elapsed()/1000 ), "kalarm"); - p->print(i18n("KRename finished the renaming process."), "edit_rename"); + p->print(i18n("KRename finished the renaming process."), "krename"); p->print(i18n("Press close to quit!")); p->setRenamedFiles( renamedFiles, m_files.count() ); diff --git a/krename/confdialog.cpp b/krename/confdialog.cpp index 58497e0..07a7794 100644 --- a/krename/confdialog.cpp +++ b/krename/confdialog.cpp @@ -72,7 +72,7 @@ void ConfDialog::setupTab1() void ConfDialog::setupTab2() { const TQString caption = i18n("KRename"); - TQFrame* box = addPage( caption, caption, BarIcon("edit_rename") ); + TQFrame* box = addPage( caption, caption, BarIcon("krename") ); TQVBoxLayout* layout = new TQVBoxLayout( box ); TQSpacerItem* spacer = new TQSpacerItem( 20, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); diff --git a/krename/hi32-app-krename.png b/krename/hi32-app-krename.png new file mode 100644 index 0000000..3aaa69a Binary files /dev/null and b/krename/hi32-app-krename.png differ diff --git a/krename/hi48-app-krename.png b/krename/hi48-app-krename.png new file mode 100644 index 0000000..fd25011 Binary files /dev/null and b/krename/hi48-app-krename.png differ diff --git a/krename/krename.desktop b/krename/krename.desktop index 0370015..4e3b029 100644 --- a/krename/krename.desktop +++ b/krename/krename.desktop @@ -1,8 +1,8 @@ [Desktop Entry] Type=Application Exec=krename -caption "%c" %i %m %U -Icon=edit_rename -MiniIcon=edit_rename +Icon=krename +MiniIcon=krename X-DocPath=krename/index.html Comment=A batch renamer Terminal=false diff --git a/krename/krename_dir.desktop b/krename/krename_dir.desktop index 6b43991..25757d4 100644 --- a/krename/krename_dir.desktop +++ b/krename/krename_dir.desktop @@ -6,4 +6,4 @@ X-TDE-ServiceTypes=inode/directory [Desktop Action Rename] Exec=krename -r %U Name=Rename with KRename -Icon=edit_rename +Icon=krename diff --git a/krename/krenameimpl.cpp b/krename/krenameimpl.cpp index bf0e839..e62c81c 100644 --- a/krename/krenameimpl.cpp +++ b/krename/krenameimpl.cpp @@ -589,7 +589,7 @@ void KRenameImpl::setupFileTab1() help.append("[$dirname];;" + i18n("insert name of directory") ); help.append("[$dirname.];;" + i18n("insert name of parent directory") ); help.append("[#length-0];;" + i18n("insert the length of the input filename") ); - helpDialogData->add( i18n("Built-in Functions:" ), &help, SmallIcon("edit_rename"), true ); + helpDialogData->add( i18n("Built-in Functions:" ), &help, SmallIcon("krename"), true ); help.clear(); help.append( "\\$;;" + i18n("Insert '$'") ); @@ -601,7 +601,7 @@ void KRenameImpl::setupFileTab1() help.append( "\\[;;" + i18n("Insert '['") ); help.append( "\\];;" + i18n("Insert ']'") ); help.append( "\\#;;" + i18n("Insert '#'") ); - helpDialogData->add( i18n("Special Characters:" ), &help, SmallIcon("edit_rename") ); + helpDialogData->add( i18n("Special Characters:" ), &help, SmallIcon("krename") ); /* //TODO: FIX this tooltip diff --git a/krename/krenameservicemenu.desktop b/krename/krenameservicemenu.desktop index 7edb146..d3a30df 100644 --- a/krename/krenameservicemenu.desktop +++ b/krename/krenameservicemenu.desktop @@ -8,5 +8,5 @@ X-TDE-ExcludeServiceTypes=kdedevice/* [Desktop Action Rename] Name=Rename with KRename Exec=krename %F -Icon=edit_rename +Icon=krename diff --git a/krename/lo16-app-krename.png b/krename/lo16-app-krename.png new file mode 100644 index 0000000..b1e3e93 Binary files /dev/null and b/krename/lo16-app-krename.png differ diff --git a/krename/lo32-app-krename.png b/krename/lo32-app-krename.png new file mode 100644 index 0000000..5c38249 Binary files /dev/null and b/krename/lo32-app-krename.png differ diff --git a/krename/tabs.cpp b/krename/tabs.cpp index 8d5aa72..2cfbf3d 100644 --- a/krename/tabs.cpp +++ b/krename/tabs.cpp @@ -36,7 +36,7 @@ tabs::tabs(KRenameImpl* impl, TQRect r, TQWidget *parent, const char *name ) : TQDialog(parent,name) { - setIcon( BarIcon( "edit_rename" ) ); + setIcon( BarIcon( "krename" ) ); TQVBoxLayout* layout = new TQVBoxLayout( this, 6, 6 ); TQHBoxLayout* buttons = new TQHBoxLayout( 0, 6, 6 ); diff --git a/krename/wizard.cpp b/krename/wizard.cpp index c25fdba..9796de4 100644 --- a/krename/wizard.cpp +++ b/krename/wizard.cpp @@ -37,7 +37,7 @@ wizard::wizard( KRenameImpl* impl, TQRect r, TQWidget* parent, const char* name ) : KWizard( parent, name ) { - setIcon( BarIcon( "edit_rename" ) ); + setIcon( BarIcon( "krename" ) ); menuBar = new KMenuBar(this); krename = impl ? impl : new KRenameImpl( this, menuBar, this->finishButton() ); -- cgit v1.2.1