TDE
/
basket
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/basket
0
0
Fork 0
Code Issues Releases Wiki Activity

Bring filenew, fileopen, fileprint, filequickprint, filesave, filesaveas, fileclose, editclear, editcopy, editcut, editdelete, editpaste, folder_new, and gohome icons into XDG compliance

Browse Source
pull/1/head
Timothy Pearson 10 years ago
parent 5595896b65
commit 425e07cd78
7 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File

4
src/backup.cpp
Unescape View File

@ -137,7 +137,7 @@ void BackupDialog::moveToAnotherFolder()
0, 0,
"<qt>" + i18n("The folder <b>%1</b> is not empty. Do you want to override it?").arg(folder), "<qt>" + i18n("The folder <b>%1</b> is not empty. Do you want to override it?").arg(folder),
i18n("Override Folder?"), i18n("Override Folder?"),
KGuiItem(i18n("&Override"), "filesave") KGuiItem(i18n("&Override"), "document-save")
); );
if (result == KMessageBox::No) if (result == KMessageBox::No)
return; return;
@ -189,7 +189,7 @@ void BackupDialog::backup()
"<qt>" + i18n("The file <b>%1</b> already exists. Do you really want to override it?") "<qt>" + i18n("The file <b>%1</b> already exists. Do you really want to override it?")
.arg(KURL(destination).fileName()), .arg(KURL(destination).fileName()),
i18n("Override File?"), i18n("Override File?"),
KGuiItem(i18n("&Override"), "filesave") KGuiItem(i18n("&Override"), "document-save")
); );
if (result == KMessageBox::Cancel) if (result == KMessageBox::Cancel)
return; return;

10
src/basket.cpp
Unescape View File

@ -3377,7 +3377,7 @@ void Basket::popupEmblemMenu(Note *note, int emblemNumber)
TDEPopupMenu menu(this); TDEPopupMenu menu(this);
if (tag->countStates() == 1) { if (tag->countStates() == 1) {
menu.insertTitle(/*SmallIcon(state->icon()), */tag->name()); menu.insertTitle(/*SmallIcon(state->icon()), */tag->name());
menu.insertItem( SmallIconSet("editdelete"), i18n("&Remove"), 1 ); menu.insertItem( SmallIconSet("edit-delete"), i18n("&Remove"), 1 );
menu.insertItem( SmallIconSet("configure"), i18n("&Customize..."), 2 ); menu.insertItem( SmallIconSet("configure"), i18n("&Customize..."), 2 );
menu.insertSeparator(); menu.insertSeparator();
menu.insertItem( SmallIconSet("filter"), i18n("&Filter by this Tag"), 3 ); menu.insertItem( SmallIconSet("filter"), i18n("&Filter by this Tag"), 3 );
@ -3398,7 +3398,7 @@ void Basket::popupEmblemMenu(Note *note, int emblemNumber)
++i; ++i;
} }
menu.insertSeparator(); menu.insertSeparator();
menu.insertItem( new IndentedMenuItem(i18n("&Remove"), "editdelete", (sequenceOnDelete ? sequence : TQKeySequence())), 1 ); menu.insertItem( new IndentedMenuItem(i18n("&Remove"), "edit-delete", (sequenceOnDelete ? sequence : TQKeySequence())), 1 );
menu.insertItem( new IndentedMenuItem(i18n("&Customize..."), "configure"), 2 ); menu.insertItem( new IndentedMenuItem(i18n("&Customize..."), "configure"), 2 );
menu.insertSeparator(); menu.insertSeparator();
menu.insertItem( new IndentedMenuItem(i18n("&Filter by this Tag"), "filter"), 3 ); menu.insertItem( new IndentedMenuItem(i18n("&Filter by this Tag"), "filter"), 3 );
@ -3501,13 +3501,13 @@ void Basket::popupTagsMenu(Note *note)
// } // }
// //
// menu.insertSeparator(); // menu.insertSeparator();
// // menu.insertItem( /*SmallIconSet("editdelete"),*/ "&Assign New Tag...", 1 ); // // menu.insertItem( /*SmallIconSet("edit-delete"),*/ "&Assign New Tag...", 1 );
// //id = menu.insertItem( SmallIconSet("editdelete"), "&Remove All", -2 ); // //id = menu.insertItem( SmallIconSet("edit-delete"), "&Remove All", -2 );
// //if (note->states().isEmpty()) // //if (note->states().isEmpty())
// // menu.setItemEnabled(id, false); // // menu.setItemEnabled(id, false);
// // menu.insertItem( SmallIconSet("configure"), "&Customize...", 3 ); // // menu.insertItem( SmallIconSet("configure"), "&Customize...", 3 );
// menu.insertItem( new IndentedMenuItem(i18n("&Assign New Tag...")), 1 ); // menu.insertItem( new IndentedMenuItem(i18n("&Assign New Tag...")), 1 );
// menu.insertItem( new IndentedMenuItem(i18n("&Remove All"), "editdelete"), 2 ); // menu.insertItem( new IndentedMenuItem(i18n("&Remove All"), "edit-delete"), 2 );
// menu.insertItem( new IndentedMenuItem(i18n("&Customize..."), "configure"), 3 ); // menu.insertItem( new IndentedMenuItem(i18n("&Customize..."), "configure"), 3 );
// //
// if (!selectedNotesHaveTags())//note->states().isEmpty()) // if (!selectedNotesHaveTags())//note->states().isEmpty())

2
src/basketstatusbar.cpp
Unescape View File

@ -89,7 +89,7 @@ void BasketStatusBar::setupStatusBar()
// addWidget( m_lockStatus, 0, true ); // addWidget( m_lockStatus, 0, true );
connect( m_lockStatus, TQT_SIGNAL(clicked()), Global::bnpView, TQT_SLOT(lockBasket()) ); connect( m_lockStatus, TQT_SIGNAL(clicked()), Global::bnpView, TQT_SLOT(lockBasket()) );
m_savedStatusPixmap = SmallIcon("filesave"); m_savedStatusPixmap = SmallIcon("document-save");
m_savedStatus = new TQLabel(parent); m_savedStatus = new TQLabel(parent);
m_savedStatus->setPixmap(m_savedStatusPixmap); m_savedStatus->setPixmap(m_savedStatusPixmap);
m_savedStatus->setFixedSize(m_savedStatus->sizeHint()); m_savedStatus->setFixedSize(m_savedStatus->sizeHint());

20
src/bnpview.cpp
Unescape View File

@ -440,7 +440,7 @@ void BNPView::setupActions()
/** Note : ****************************************************************/ /** Note : ****************************************************************/
m_actDelNote = new TDEAction( i18n("D&elete"), "editdelete", "Delete", m_actDelNote = new TDEAction( i18n("D&elete"), "edit-delete", "Delete",
TQT_TQOBJECT(this), TQT_SLOT(delNote()), actionCollection(), "edit_delete" ); TQT_TQOBJECT(this), TQT_SLOT(delNote()), actionCollection(), "edit_delete" );
m_actCutNote = KStdAction::cut( TQT_TQOBJECT(this), TQT_SLOT(cutNote()), actionCollection() ); m_actCutNote = KStdAction::cut( TQT_TQOBJECT(this), TQT_SLOT(cutNote()), actionCollection() );
m_actCopyNote = KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT(copyNote()), actionCollection() ); m_actCopyNote = KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT(copyNote()), actionCollection() );
@ -563,14 +563,14 @@ void BNPView::setupActions()
} }
// Use the "basket" incon in Kontact so it is consistent with the Kontact "New..." icon // Use the "basket" incon in Kontact so it is consistent with the Kontact "New..." icon
actNewBasket = new TDEAction( i18n("&New Basket..."), (runInsideKontact ? "basket" : "filenew"), TDEStdAccel::shortcut(TDEStdAccel::New), actNewBasket = new TDEAction( i18n("&New Basket..."), (runInsideKontact ? "basket" : "document-new"), TDEStdAccel::shortcut(TDEStdAccel::New),
TQT_TQOBJECT(this), TQT_SLOT(askNewBasket()), actionCollection(), "basket_new" ); TQT_TQOBJECT(this), TQT_SLOT(askNewBasket()), actionCollection(), "basket_new" );
actNewSubBasket = new TDEAction( i18n("New &Sub-Basket..."), "", "Ctrl+Shift+N", actNewSubBasket = new TDEAction( i18n("New &Sub-Basket..."), "", "Ctrl+Shift+N",
TQT_TQOBJECT(this), TQT_SLOT(askNewSubBasket()), actionCollection(), "basket_new_sub" ); TQT_TQOBJECT(this), TQT_SLOT(askNewSubBasket()), actionCollection(), "basket_new_sub" );
actNewSiblingBasket = new TDEAction( i18n("New Si&bling Basket..."), "", "", actNewSiblingBasket = new TDEAction( i18n("New Si&bling Basket..."), "", "",
TQT_TQOBJECT(this), TQT_SLOT(askNewSiblingBasket()), actionCollection(), "basket_new_sibling" ); TQT_TQOBJECT(this), TQT_SLOT(askNewSiblingBasket()), actionCollection(), "basket_new_sibling" );
TDEActionMenu *newBasketMenu = new TDEActionMenu(i18n("&New"), "filenew", actionCollection(), "basket_new_menu"); TDEActionMenu *newBasketMenu = new TDEActionMenu(i18n("&New"), "document-new", actionCollection(), "basket_new_menu");
newBasketMenu->insert(actNewBasket); newBasketMenu->insert(actNewBasket);
newBasketMenu->insert(actNewSubBasket); newBasketMenu->insert(actNewSubBasket);
newBasketMenu->insert(actNewSiblingBasket); newBasketMenu->insert(actNewSiblingBasket);
@ -1429,7 +1429,7 @@ void BNPView::updateNotesActions()
} }
} else if (m_type != Color) { } else if (m_type != Color) {
popupMenu->insertSeparator(); popupMenu->insertSeparator();
popupMenu->insertItem( SmallIconSet("filesaveas"), i18n("&Save a copy as..."), TQT_TQOBJECT(this), TQT_SLOT(slotSaveAs()), 0, 10 ); popupMenu->insertItem( SmallIconSet("document-save-as"), i18n("&Save a copy as..."), TQT_TQOBJECT(this), TQT_SLOT(slotSaveAs()), 0, 10 );
}*/ }*/
} }
@ -1710,7 +1710,7 @@ void BNPView::delBasket()
.arg(Tools::textToHTMLWithoutP(basket->basketName())), .arg(Tools::textToHTMLWithoutP(basket->basketName())),
i18n("Remove Basket") i18n("Remove Basket")
#if KDE_IS_VERSION( 3, 2, 90 ) // KDE 3.3.x #if KDE_IS_VERSION( 3, 2, 90 ) // KDE 3.3.x
, KGuiItem(i18n("&Remove Basket"), "editdelete"), KStdGuiItem::cancel()); , KGuiItem(i18n("&Remove Basket"), "edit-delete"), KStdGuiItem::cancel());
#else #else
); );
#endif #endif
@ -1726,7 +1726,7 @@ void BNPView::delBasket()
basketsList, basketsList,
i18n("Remove Children Baskets") i18n("Remove Children Baskets")
#if KDE_IS_VERSION( 3, 2, 90 ) // KDE 3.3.x #if KDE_IS_VERSION( 3, 2, 90 ) // KDE 3.3.x
, KGuiItem(i18n("&Remove Children Baskets"), "editdelete")); , KGuiItem(i18n("&Remove Children Baskets"), "edit-delete"));
#else #else
); );
#endif #endif
@ -1810,7 +1810,7 @@ void BNPView::saveAsArchive()
"<qt>" + i18n("The file <b>%1</b> already exists. Do you really want to override it?") "<qt>" + i18n("The file <b>%1</b> already exists. Do you really want to override it?")
.arg(KURL(destination).fileName()), .arg(KURL(destination).fileName()),
i18n("Override File?"), i18n("Override File?"),
KGuiItem(i18n("&Override"), "filesave") KGuiItem(i18n("&Override"), "document-save")
); );
if (result == KMessageBox::Cancel) if (result == KMessageBox::Cancel)
return; return;
@ -2310,13 +2310,13 @@ void BNPView::populateTagsMenu(TDEPopupMenu &menu, Note *referenceNote)
} }
menu.insertSeparator(); menu.insertSeparator();
// menu.insertItem( /*SmallIconSet("editdelete"),*/ "&Assign new Tag...", 1 ); // menu.insertItem( /*SmallIconSet("edit-delete"),*/ "&Assign new Tag...", 1 );
//id = menu.insertItem( SmallIconSet("editdelete"), "&Remove All", -2 ); //id = menu.insertItem( SmallIconSet("edit-delete"), "&Remove All", -2 );
//if (referenceNote->states().isEmpty()) //if (referenceNote->states().isEmpty())
// menu.setItemEnabled(id, false); // menu.setItemEnabled(id, false);
// menu.insertItem( SmallIconSet("configure"), "&Customize...", 3 ); // menu.insertItem( SmallIconSet("configure"), "&Customize...", 3 );
menu.insertItem( new IndentedMenuItem(i18n("&Assign new Tag...")), 1 ); menu.insertItem( new IndentedMenuItem(i18n("&Assign new Tag...")), 1 );
menu.insertItem( new IndentedMenuItem(i18n("&Remove All"), "editdelete"), 2 ); menu.insertItem( new IndentedMenuItem(i18n("&Remove All"), "edit-delete"), 2 );
menu.insertItem( new IndentedMenuItem(i18n("&Customize..."), "configure"), 3 ); menu.insertItem( new IndentedMenuItem(i18n("&Customize..."), "configure"), 3 );
menu.setItemEnabled(1, enable); menu.setItemEnabled(1, enable);

2
src/htmlexporter.cpp
Unescape View File

@ -65,7 +65,7 @@ HTMLExporter::HTMLExporter(Basket *basket)
"<qt>" + i18n("The file <b>%1</b> already exists. Do you really want to override it?") "<qt>" + i18n("The file <b>%1</b> already exists. Do you really want to override it?")
.arg(KURL(destination).fileName()), .arg(KURL(destination).fileName()),
i18n("Override File?"), i18n("Override File?"),
KGuiItem(i18n("&Override"), "filesave") KGuiItem(i18n("&Override"), "document-save")
); );
if (result == KMessageBox::Cancel) if (result == KMessageBox::Cancel)
return; return;

2
src/notefactory.cpp
Unescape View File

@ -501,7 +501,7 @@ Note* NoteFactory::dropURLs(KURL::List urls, Basket *parent, TQDropEvent::Action
if (shouldAsk) { if (shouldAsk) {
TDEPopupMenu menu(parent); TDEPopupMenu menu(parent);
menu.insertItem( SmallIconSet("goto"), i18n("&Move Here\tShift"), 0 ); menu.insertItem( SmallIconSet("goto"), i18n("&Move Here\tShift"), 0 );
menu.insertItem( SmallIconSet("editcopy"), i18n("&Copy Here\tCtrl"), 1 ); menu.insertItem( SmallIconSet("edit-copy"), i18n("&Copy Here\tCtrl"), 1 );
menu.insertItem( SmallIconSet("www"), i18n("&Link Here\tCtrl+Shift"), 2 ); menu.insertItem( SmallIconSet("www"), i18n("&Link Here\tCtrl+Shift"), 2 );
menu.insertSeparator(); menu.insertSeparator();
menu.insertItem( SmallIconSet("cancel"), i18n("C&ancel\tEscape"), 3 ); menu.insertItem( SmallIconSet("cancel"), i18n("C&ancel\tEscape"), 3 );

8
src/tagsedit.cpp
Unescape View File

@ -345,7 +345,7 @@ TagsEditDialog::TagsEditDialog(TQWidget *parent, State *stateToEdit, bool addNew
m_moveUp = new KPushButton( KGuiItem("", "1uparrow"), plainPage() ); m_moveUp = new KPushButton( KGuiItem("", "1uparrow"), plainPage() );
m_moveDown = new KPushButton( KGuiItem("", "1downarrow"), plainPage() ); m_moveDown = new KPushButton( KGuiItem("", "1downarrow"), plainPage() );
m_deleteTag = new KPushButton( KGuiItem("", "editdelete"), plainPage() ); m_deleteTag = new KPushButton( KGuiItem("", "edit-delete"), plainPage() );
TQToolTip::add( m_moveUp, i18n("Move Up (Ctrl+Shift+Up)") ); TQToolTip::add( m_moveUp, i18n("Move Up (Ctrl+Shift+Up)") );
TQToolTip::add( m_moveDown, i18n("Move Down (Ctrl+Shift+Down)") ); TQToolTip::add( m_moveDown, i18n("Move Down (Ctrl+Shift+Down)") );
@ -405,7 +405,7 @@ TagsEditDialog::TagsEditDialog(TQWidget *parent, State *stateToEdit, bool addNew
m_emblem = new TDEIconButton(emblemWidget); m_emblem = new TDEIconButton(emblemWidget);
m_emblem->setIconType(TDEIcon::NoGroup, TDEIcon::Action); m_emblem->setIconType(TDEIcon::NoGroup, TDEIcon::Action);
m_emblem->setIconSize(16); m_emblem->setIconSize(16);
m_emblem->setIcon("editdelete"); m_emblem->setIcon("edit-delete");
m_removeEmblem = new TQPushButton(i18n("Remove tag emblem", "Remo&ve"), emblemWidget); m_removeEmblem = new TQPushButton(i18n("Remove tag emblem", "Remo&ve"), emblemWidget);
TQLabel *emblemLabel = new TQLabel(m_emblem, i18n("&Emblem:"), stateWidget); TQLabel *emblemLabel = new TQLabel(m_emblem, i18n("&Emblem:"), stateWidget);
connect( m_removeEmblem, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeEmblem()) ); // m_emblem.resetIcon() is not a slot! connect( m_removeEmblem, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeEmblem()) ); // m_emblem.resetIcon() is not a slot!
@ -900,14 +900,14 @@ void TagsEditDialog::deleteTag()
this, this,
i18n("Deleting the tag will remove it from every note it is currently assigned to."), i18n("Deleting the tag will remove it from every note it is currently assigned to."),
i18n("Confirm Delete Tag"), i18n("Confirm Delete Tag"),
KGuiItem(i18n("Delete Tag"), "editdelete") KGuiItem(i18n("Delete Tag"), "edit-delete")
); );
else if (item->stateCopy() && item->stateCopy()->oldState) else if (item->stateCopy() && item->stateCopy()->oldState)
result = KMessageBox::warningContinueCancel( result = KMessageBox::warningContinueCancel(
this, this,
i18n("Deleting the state will remove the tag from every note the state is currently assigned to."), i18n("Deleting the state will remove the tag from every note the state is currently assigned to."),
i18n("Confirm Delete State"), i18n("Confirm Delete State"),
KGuiItem(i18n("Delete State"), "editdelete") KGuiItem(i18n("Delete State"), "edit-delete")
); );
if (result != KMessageBox::Continue) if (result != KMessageBox::Continue)
return; return;

Write Preview
Loading…
Cancel
Save