Changeset 176 for smplayer/trunk/src/toolbareditor.cpp

Timestamp:

May 3, 2016, 5:25:45 PM (9 years ago)

Author:

Silvan Scherrer

Message:

smplayer: update trunk to version 16.4

Location:

smplayer/trunk

Files:

• . (modified) (1 prop)
• src/toolbareditor.cpp (modified) (5 diffs)

smplayer/trunk/src/toolbareditor.cpp

@@ -1 +1 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2014 Ricardo Villalba <rvm@users.sourceforge.net>
+    Copyright (C) 2006-2016 Ricardo Villalba <rvm@users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or modify
@@ -65 +65 @@
 
 ToolbarEditor::~ToolbarEditor() {
+}
+
+void ToolbarEditor::setIconSize(int size) {
+        iconsize_spin->setValue(size);
+}
+
+int ToolbarEditor::iconSize() {
+        return iconsize_spin->value();
 }
 
@@ -78 +86 @@
                                 QString text = fixname(action->text(), action->objectName());
                                 i->setText(text + " ("+ action->objectName() +")");
-                                i->setIcon(action->icon());
+                                QIcon icon = action->icon();
+                                if (icon.isNull()) {
+                                        icon = Images::icon("empty_icon");
+                                }
+                                i->setIcon(icon);
                                 i->setData(Qt::UserRole, action->objectName());
                                 w->addItem(i);
@@ -85 +97 @@
                         if ((action->isSeparator()) && (add_separators)) {
                                 QListWidgetItem * i = new QListWidgetItem;
-                                i->setText(tr("(separator)"));
+                                //i->setText(tr("(separator)"));
+                                i->setText("---------");
                                 i->setData(Qt::UserRole, "separator");
+                                i->setIcon(Images::icon("empty_icon"));
                                 w->addItem(i);
                         }
@@ -178 +192 @@
 
         QListWidgetItem * i = new QListWidgetItem;
-        i->setText(tr("(separator)"));
+        //i->setText(tr("(separator)"));
+        i->setText("---------");
         i->setData(Qt::UserRole, "separator");
+        i->setIcon(Images::icon("empty_icon"));
 
         int row = active_actions_list->currentRow();