Changeset 176 for smplayer/trunk/src/toolbareditor.cpp
- Timestamp:
- May 3, 2016, 5:25:45 PM (10 years ago)
- Location:
- smplayer/trunk
- Files:
-
- 2 edited
-
. (modified) (1 prop)
-
src/toolbareditor.cpp (modified) (5 diffs)
Legend:
- Unmodified
- Added
- Removed
-
smplayer/trunk
- Property svn:mergeinfo changed
/smplayer/vendor/current merged: 175
- Property svn:mergeinfo changed
-
smplayer/trunk/src/toolbareditor.cpp
r165 r176 1 1 /* smplayer, GUI front-end for mplayer. 2 Copyright (C) 2006-201 4Ricardo Villalba <[email protected]>2 Copyright (C) 2006-201 Ricardo Villalba <[email protected]> 3 3 4 4 This program is free software; you can redistribute it and/or modify … … 65 65 66 66 ToolbarEditor::~ToolbarEditor() { 67 68 69 70 71 72 73 74 67 75 } 68 76 … … 78 86 QString text = fixname(action->text(), action->objectName()); 79 87 i->setText(text + " ("+ action->objectName() +")"); 80 i->setIcon(action->icon()); 88 QIcon icon = action->icon(); 89 if (icon.isNull()) { 90 icon = Images::icon("empty_icon"); 91 } 92 i->setIcon(icon); 81 93 i->setData(Qt::UserRole, action->objectName()); 82 94 w->addItem(i); … … 85 97 if ((action->isSeparator()) && (add_separators)) { 86 98 QListWidgetItem * i = new QListWidgetItem; 87 i->setText(tr("(separator)")); 99 //i->setText(tr("(separator)")); 100 i->setText("---------"); 88 101 i->setData(Qt::UserRole, "separator"); 102 89 103 w->addItem(i); 90 104 } … … 178 192 179 193 QListWidgetItem * i = new QListWidgetItem; 180 i->setText(tr("(separator)")); 194 //i->setText(tr("(separator)")); 195 i->setText("---------"); 181 196 i->setData(Qt::UserRole, "separator"); 197 182 198 183 199 int row = active_actions_list->currentRow();
Note:
See TracChangeset
for help on using the changeset viewer.
