From 4a8edee615d763e4b8e874841a7f27349fefca5c Mon Sep 17 00:00:00 2001 From: csoler Date: Sat, 6 Feb 2016 12:01:39 -0500 Subject: [PATCH] reverted commits 1843a5460d7fba276378e9e866a5f0228d056b64 and 48d7c576622a03c857499b8ea318fa5534ef5164 for the release, since they dont fit the GUI style and cause problems, until they are made right --- .../src/gui/qss/stylesheet/Standard.qss | 19 ---- .../src/gui/statusbar/OpModeStatus.cpp | 89 +++---------------- .../src/gui/statusbar/OpModeStatus.h | 23 +---- retroshare-gui/src/qss/blacknight.qss | 20 +---- retroshare-gui/src/qss/blue.qss | 19 ---- retroshare-gui/src/qss/groove.qss | 21 ----- retroshare-gui/src/qss/orangesurfer.qss | 19 ---- retroshare-gui/src/qss/qdarkstyle.qss | 19 ---- retroshare-gui/src/qss/qlive.qss | 19 ---- retroshare-gui/src/qss/redscorpion.qss | 19 ---- retroshare-gui/src/qss/silver.qss | 19 ---- retroshare-gui/src/qss/silvergrey.qss | 19 ---- retroshare-gui/src/qss/uus.qss | 19 ---- retroshare-gui/src/qss/wx.qss | 19 ---- retroshare-gui/src/qss/yaba.qss | 19 ---- retroshare-gui/src/qss/yeah.qss | 19 ---- 16 files changed, 12 insertions(+), 369 deletions(-) diff --git a/retroshare-gui/src/gui/qss/stylesheet/Standard.qss b/retroshare-gui/src/gui/qss/stylesheet/Standard.qss index 05a9b6e94..9fa5593d5 100644 --- a/retroshare-gui/src/gui/qss/stylesheet/Standard.qss +++ b/retroshare-gui/src/gui/qss/stylesheet/Standard.qss @@ -662,22 +662,3 @@ IdEditDialog QLabel#info_label background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #FFFFD7, stop:1 #FFFFB2); } -/* OpModeStatus need to be at end to overload other values*/ -OpModeStatus { - qproperty-opMode_Full_Color: #CCFFCC; - qproperty-opMode_NoTurtle_Color: #CCCCFF; - qproperty-opMode_Gaming_Color: #FFFFCC; - qproperty-opMode_Minimal_Color: #FFCCCC; -} -OpModeStatus[opMode="Full"] { - background: #CCFFCC; -} -OpModeStatus[opMode="NoTurtle"] { - background: #CCCCFF; -} -OpModeStatus[opMode="Gaming"] { - background: #FFFFCC; -} -OpModeStatus[opMode="Minimal"] { - background: #FFCCCC; -} diff --git a/retroshare-gui/src/gui/statusbar/OpModeStatus.cpp b/retroshare-gui/src/gui/statusbar/OpModeStatus.cpp index e7f7eab13..96934c5bf 100644 --- a/retroshare-gui/src/gui/statusbar/OpModeStatus.cpp +++ b/retroshare-gui/src/gui/statusbar/OpModeStatus.cpp @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301, USA. ****************************************************************/ @@ -23,35 +23,26 @@ #include #include "gui/statusbar/OpModeStatus.h" -#include "gui/settings/rsharesettings.h" - #include - #include OpModeStatus::OpModeStatus(QWidget *parent) - : QComboBox(parent) + : QComboBox(parent) { - onUpdate = false; /* add the options */ addItem(tr("Normal Mode"), RS_OPMODE_FULL); - setItemData(0, opMode_Full_Color, Qt::BackgroundRole); addItem(tr("No Anon D/L"), RS_OPMODE_NOTURTLE); - setItemData(1, opMode_NoTurtle_Color, Qt::BackgroundRole); addItem(tr("Gaming Mode"), RS_OPMODE_GAMING); - setItemData(2, opMode_Gaming_Color, Qt::BackgroundRole); addItem(tr("Low Traffic"), RS_OPMODE_MINIMAL); - setItemData(3, opMode_Minimal_Color, Qt::BackgroundRole); connect(this, SIGNAL(activated( int )), this, SLOT(setOpMode())); - setCurrentIndex(Settings->valueFromGroup("StatusBar", "OpMode", QVariant(0)).toInt()); - setOpMode(); setToolTip(tr("Use this DropList to quickly change Retroshare's behaviour\n No Anon D/L: switches off file forwarding\n Gaming Mode: 25% standard traffic and TODO: reduced popups\n Low Traffic: 10% standard traffic and TODO: pauses all file-transfers")); setFocusPolicy(Qt::ClickFocus); } + void OpModeStatus::getOpMode() { int opMode = rsConfig->getOperatingMode(); @@ -60,26 +51,17 @@ void OpModeStatus::getOpMode() default: case RS_OPMODE_FULL: setCurrentIndex(0); - setProperty("opMode", "Full"); - break; + break; case RS_OPMODE_NOTURTLE: setCurrentIndex(1); - setProperty("opMode", "NoTurtle"); - break; + break; case RS_OPMODE_GAMING: setCurrentIndex(2); - setProperty("opMode", "Gaming"); - break; + break; case RS_OPMODE_MINIMAL: setCurrentIndex(3); - setProperty("opMode", "Minimal"); - break; + break; } - onUpdate = true; - style()->unpolish(this); - style()->polish(this); - update(); - onUpdate = false; } void OpModeStatus::setOpMode() @@ -87,65 +69,14 @@ void OpModeStatus::setOpMode() std::cerr << "OpModeStatus::setOpMode()"; std::cerr << std::endl; - int idx = currentIndex(); - QVariant var = itemData(idx); - uint32_t opMode = var.toUInt(); + int idx = currentIndex(); + QVariant var = itemData(idx); + uint32_t opMode = var.toUInt(); rsConfig->setOperatingMode(opMode); // reload to be safe. getOpMode(); - Settings->setValueToGroup("StatusBar", "OpMode", idx); } -QColor OpModeStatus::getOpMode_Full_Color() const -{ - return opMode_Full_Color; -} -void OpModeStatus::setOpMode_Full_Color( QColor c ) -{ - opMode_Full_Color = c; - setItemData(0, opMode_Full_Color, Qt::BackgroundRole); - if (!onUpdate) - getOpMode(); -} - -QColor OpModeStatus::getOpMode_NoTurtle_Color() const -{ - return opMode_NoTurtle_Color; -} - -void OpModeStatus::setOpMode_NoTurtle_Color( QColor c ) -{ - opMode_NoTurtle_Color = c; - setItemData(1, opMode_NoTurtle_Color, Qt::BackgroundRole); - if (!onUpdate) - getOpMode(); -} - -QColor OpModeStatus::getOpMode_Gaming_Color() const -{ - return opMode_Gaming_Color; -} - -void OpModeStatus::setOpMode_Gaming_Color( QColor c ) -{ - opMode_Gaming_Color = c; - setItemData(2, opMode_Gaming_Color, Qt::BackgroundRole); - if (!onUpdate) - getOpMode(); -} - -QColor OpModeStatus::getOpMode_Minimal_Color() const -{ - return opMode_Minimal_Color; -} - -void OpModeStatus::setOpMode_Minimal_Color( QColor c ) -{ - opMode_Minimal_Color = c; - setItemData(3, opMode_Minimal_Color, Qt::BackgroundRole); - if (!onUpdate) - getOpMode(); -} diff --git a/retroshare-gui/src/gui/statusbar/OpModeStatus.h b/retroshare-gui/src/gui/statusbar/OpModeStatus.h index 43156be1f..6e84aea3a 100644 --- a/retroshare-gui/src/gui/statusbar/OpModeStatus.h +++ b/retroshare-gui/src/gui/statusbar/OpModeStatus.h @@ -26,37 +26,16 @@ class OpModeStatus : public QComboBox { Q_OBJECT - Q_PROPERTY(QColor opMode_Full_Color READ getOpMode_Full_Color WRITE setOpMode_Full_Color DESIGNABLE true) - Q_PROPERTY(QColor opMode_NoTurtle_Color READ getOpMode_NoTurtle_Color WRITE setOpMode_NoTurtle_Color DESIGNABLE true) - Q_PROPERTY(QColor opMode_Gaming_Color READ getOpMode_Gaming_Color WRITE setOpMode_Gaming_Color DESIGNABLE true) - Q_PROPERTY(QColor opMode_Minimal_Color READ getOpMode_Minimal_Color WRITE setOpMode_Minimal_Color DESIGNABLE true) public: OpModeStatus(QWidget *parent = 0); - QColor getOpMode_Full_Color() const; - void setOpMode_Full_Color( QColor c ); - - QColor getOpMode_NoTurtle_Color() const; - void setOpMode_NoTurtle_Color( QColor c ); - - QColor getOpMode_Gaming_Color() const; - void setOpMode_Gaming_Color( QColor c ); - - QColor getOpMode_Minimal_Color() const; - void setOpMode_Minimal_Color( QColor c ); - private slots: - void setOpMode(); + void setOpMode(); private: void getOpMode(); - QColor opMode_Full_Color; - QColor opMode_NoTurtle_Color; - QColor opMode_Gaming_Color; - QColor opMode_Minimal_Color; - bool onUpdate; }; #endif diff --git a/retroshare-gui/src/qss/blacknight.qss b/retroshare-gui/src/qss/blacknight.qss index 4a454c54e..286183dfc 100644 --- a/retroshare-gui/src/qss/blacknight.qss +++ b/retroshare-gui/src/qss/blacknight.qss @@ -273,22 +273,4 @@ QTextEdit { color: white; } -/* OpModeStatus need to be at end to overload other values*/ -OpModeStatus { - qproperty-opMode_Full_Color: #007000; - qproperty-opMode_NoTurtle_Color: #000070; - qproperty-opMode_Gaming_Color: #707000; - qproperty-opMode_Minimal_Color: #700000; -} -OpModeStatus[opMode="Full"] { - background: #007000; -} -OpModeStatus[opMode="NoTurtle"] { - background: #000070; -} -OpModeStatus[opMode="Gaming"] { - background: #707000; -} -OpModeStatus[opMode="Minimal"] { - background: #700000; -} + diff --git a/retroshare-gui/src/qss/blue.qss b/retroshare-gui/src/qss/blue.qss index 792a1dc4d..35e5bc7e7 100644 --- a/retroshare-gui/src/qss/blue.qss +++ b/retroshare-gui/src/qss/blue.qss @@ -173,22 +173,3 @@ QSplitter#splitter{ } -/* OpModeStatus need to be at end to overload other values*/ -OpModeStatus { - qproperty-opMode_Full_Color: #CCFFCC; - qproperty-opMode_NoTurtle_Color: #CCCCFF; - qproperty-opMode_Gaming_Color: #FFFFCC; - qproperty-opMode_Minimal_Color: #FFCCCC; -} -OpModeStatus[opMode="Full"] { - background: #CCFFCC; -} -OpModeStatus[opMode="NoTurtle"] { - background: #CCCCFF; -} -OpModeStatus[opMode="Gaming"] { - background: #FFFFCC; -} -OpModeStatus[opMode="Minimal"] { - background: #FFCCCC; -} diff --git a/retroshare-gui/src/qss/groove.qss b/retroshare-gui/src/qss/groove.qss index e4e5a6e97..3071eccca 100644 --- a/retroshare-gui/src/qss/groove.qss +++ b/retroshare-gui/src/qss/groove.qss @@ -65,24 +65,3 @@ QTreeWidget::item:selected { /* when user selects item using mouse or keyboard * } -Q - -/* OpModeStatus need to be at end to overload other values*/ -OpModeStatus { - qproperty-opMode_Full_Color: #CCFFCC; - qproperty-opMode_NoTurtle_Color: #CCCCFF; - qproperty-opMode_Gaming_Color: #FFFFCC; - qproperty-opMode_Minimal_Color: #FFCCCC; -} -OpModeStatus[opMode="Full"] { - background: #CCFFCC; -} -OpModeStatus[opMode="NoTurtle"] { - background: #CCCCFF; -} -OpModeStatus[opMode="Gaming"] { - background: #FFFFCC; -} -OpModeStatus[opMode="Minimal"] { - background: #FFCCCC; -} diff --git a/retroshare-gui/src/qss/orangesurfer.qss b/retroshare-gui/src/qss/orangesurfer.qss index a178238b9..84ae1c4fd 100644 --- a/retroshare-gui/src/qss/orangesurfer.qss +++ b/retroshare-gui/src/qss/orangesurfer.qss @@ -206,22 +206,3 @@ QLabel#fromText{ } -/* OpModeStatus need to be at end to overload other values*/ -OpModeStatus { - qproperty-opMode_Full_Color: #CCFFCC; - qproperty-opMode_NoTurtle_Color: #CCCCFF; - qproperty-opMode_Gaming_Color: #FFFFCC; - qproperty-opMode_Minimal_Color: #FFCCCC; -} -OpModeStatus[opMode="Full"] { - background: #CCFFCC; -} -OpModeStatus[opMode="NoTurtle"] { - background: #CCCCFF; -} -OpModeStatus[opMode="Gaming"] { - background: #FFFFCC; -} -OpModeStatus[opMode="Minimal"] { - background: #FFCCCC; -} diff --git a/retroshare-gui/src/qss/qdarkstyle.qss b/retroshare-gui/src/qss/qdarkstyle.qss index 74ad6abc8..f5fb9f1de 100644 --- a/retroshare-gui/src/qss/qdarkstyle.qss +++ b/retroshare-gui/src/qss/qdarkstyle.qss @@ -1058,22 +1058,3 @@ QStatusBar::item { border-radius: 3px; } -/* OpModeStatus need to be at end to overload other values*/ -OpModeStatus { - qproperty-opMode_Full_Color: #007000; - qproperty-opMode_NoTurtle_Color: #000070; - qproperty-opMode_Gaming_Color: #707000; - qproperty-opMode_Minimal_Color: #700000; -} -OpModeStatus[opMode="Full"] { - background: #007000; -} -OpModeStatus[opMode="NoTurtle"] { - background: #000070; -} -OpModeStatus[opMode="Gaming"] { - background: #707000; -} -OpModeStatus[opMode="Minimal"] { - background: #700000; -} diff --git a/retroshare-gui/src/qss/qlive.qss b/retroshare-gui/src/qss/qlive.qss index ca1cbd0ea..b5e7a45a8 100644 --- a/retroshare-gui/src/qss/qlive.qss +++ b/retroshare-gui/src/qss/qlive.qss @@ -116,22 +116,3 @@ QStatusBar{ border-image: url(qss/qlive/qb.png); } -/* OpModeStatus need to be at end to overload other values*/ -OpModeStatus { - qproperty-opMode_Full_Color: #CCFFCC; - qproperty-opMode_NoTurtle_Color: #CCCCFF; - qproperty-opMode_Gaming_Color: #FFFFCC; - qproperty-opMode_Minimal_Color: #FFCCCC; -} -OpModeStatus[opMode="Full"] { - background: #CCFFCC; -} -OpModeStatus[opMode="NoTurtle"] { - background: #CCCCFF; -} -OpModeStatus[opMode="Gaming"] { - background: #FFFFCC; -} -OpModeStatus[opMode="Minimal"] { - background: #FFCCCC; -} diff --git a/retroshare-gui/src/qss/redscorpion.qss b/retroshare-gui/src/qss/redscorpion.qss index 014535305..4946745ca 100644 --- a/retroshare-gui/src/qss/redscorpion.qss +++ b/retroshare-gui/src/qss/redscorpion.qss @@ -288,22 +288,3 @@ QLabel#threadTitle{ color: black; } -/* OpModeStatus need to be at end to overload other values*/ -OpModeStatus { - qproperty-opMode_Full_Color: #CCFFCC; - qproperty-opMode_NoTurtle_Color: #CCCCFF; - qproperty-opMode_Gaming_Color: #FFFFCC; - qproperty-opMode_Minimal_Color: #FFCCCC; -} -OpModeStatus[opMode="Full"] { - background: #CCFFCC; -} -OpModeStatus[opMode="NoTurtle"] { - background: #CCCCFF; -} -OpModeStatus[opMode="Gaming"] { - background: #FFFFCC; -} -OpModeStatus[opMode="Minimal"] { - background: #FFCCCC; -} diff --git a/retroshare-gui/src/qss/silver.qss b/retroshare-gui/src/qss/silver.qss index ca061984f..3d8d30909 100644 --- a/retroshare-gui/src/qss/silver.qss +++ b/retroshare-gui/src/qss/silver.qss @@ -136,22 +136,3 @@ QLabel#fromText{ } -/* OpModeStatus need to be at end to overload other values*/ -OpModeStatus { - qproperty-opMode_Full_Color: #CCFFCC; - qproperty-opMode_NoTurtle_Color: #CCCCFF; - qproperty-opMode_Gaming_Color: #FFFFCC; - qproperty-opMode_Minimal_Color: #FFCCCC; -} -OpModeStatus[opMode="Full"] { - background: #CCFFCC; -} -OpModeStatus[opMode="NoTurtle"] { - background: #CCCCFF; -} -OpModeStatus[opMode="Gaming"] { - background: #FFFFCC; -} -OpModeStatus[opMode="Minimal"] { - background: #FFCCCC; -} diff --git a/retroshare-gui/src/qss/silvergrey.qss b/retroshare-gui/src/qss/silvergrey.qss index e13908b40..cfaf959e8 100644 --- a/retroshare-gui/src/qss/silvergrey.qss +++ b/retroshare-gui/src/qss/silvergrey.qss @@ -163,22 +163,3 @@ QLabel#fromText{ } -/* OpModeStatus need to be at end to overload other values*/ -OpModeStatus { - qproperty-opMode_Full_Color: #CCFFCC; - qproperty-opMode_NoTurtle_Color: #CCCCFF; - qproperty-opMode_Gaming_Color: #FFFFCC; - qproperty-opMode_Minimal_Color: #FFCCCC; -} -OpModeStatus[opMode="Full"] { - background: #CCFFCC; -} -OpModeStatus[opMode="NoTurtle"] { - background: #CCCCFF; -} -OpModeStatus[opMode="Gaming"] { - background: #FFFFCC; -} -OpModeStatus[opMode="Minimal"] { - background: #FFCCCC; -} diff --git a/retroshare-gui/src/qss/uus.qss b/retroshare-gui/src/qss/uus.qss index b452e65e1..3827ac94e 100644 --- a/retroshare-gui/src/qss/uus.qss +++ b/retroshare-gui/src/qss/uus.qss @@ -302,22 +302,3 @@ QStatusBar { } -/* OpModeStatus need to be at end to overload other values*/ -OpModeStatus { - qproperty-opMode_Full_Color: #CCFFCC; - qproperty-opMode_NoTurtle_Color: #CCCCFF; - qproperty-opMode_Gaming_Color: #FFFFCC; - qproperty-opMode_Minimal_Color: #FFCCCC; -} -OpModeStatus[opMode="Full"] { - background: #CCFFCC; -} -OpModeStatus[opMode="NoTurtle"] { - background: #CCCCFF; -} -OpModeStatus[opMode="Gaming"] { - background: #FFFFCC; -} -OpModeStatus[opMode="Minimal"] { - background: #FFCCCC; -} diff --git a/retroshare-gui/src/qss/wx.qss b/retroshare-gui/src/qss/wx.qss index c836e61b8..b214c6766 100644 --- a/retroshare-gui/src/qss/wx.qss +++ b/retroshare-gui/src/qss/wx.qss @@ -86,22 +86,3 @@ QLabel#fromText{ } -/* OpModeStatus need to be at end to overload other values*/ -OpModeStatus { - qproperty-opMode_Full_Color: #CCFFCC; - qproperty-opMode_NoTurtle_Color: #CCCCFF; - qproperty-opMode_Gaming_Color: #FFFFCC; - qproperty-opMode_Minimal_Color: #FFCCCC; -} -OpModeStatus[opMode="Full"] { - background: #CCFFCC; -} -OpModeStatus[opMode="NoTurtle"] { - background: #CCCCFF; -} -OpModeStatus[opMode="Gaming"] { - background: #FFFFCC; -} -OpModeStatus[opMode="Minimal"] { - background: #FFCCCC; -} diff --git a/retroshare-gui/src/qss/yaba.qss b/retroshare-gui/src/qss/yaba.qss index dd8f4877d..a9b1e80db 100644 --- a/retroshare-gui/src/qss/yaba.qss +++ b/retroshare-gui/src/qss/yaba.qss @@ -206,22 +206,3 @@ QToolBar#chattoolBar{ } -/* OpModeStatus need to be at end to overload other values*/ -OpModeStatus { - qproperty-opMode_Full_Color: #CCFFCC; - qproperty-opMode_NoTurtle_Color: #CCCCFF; - qproperty-opMode_Gaming_Color: #FFFFCC; - qproperty-opMode_Minimal_Color: #FFCCCC; -} -OpModeStatus[opMode="Full"] { - background: #CCFFCC; -} -OpModeStatus[opMode="NoTurtle"] { - background: #CCCCFF; -} -OpModeStatus[opMode="Gaming"] { - background: #FFFFCC; -} -OpModeStatus[opMode="Minimal"] { - background: #FFCCCC; -} diff --git a/retroshare-gui/src/qss/yeah.qss b/retroshare-gui/src/qss/yeah.qss index 9c7925660..e625c1867 100644 --- a/retroshare-gui/src/qss/yeah.qss +++ b/retroshare-gui/src/qss/yeah.qss @@ -169,22 +169,3 @@ QLabel#fromText{ } -/* OpModeStatus need to be at end to overload other values*/ -OpModeStatus { - qproperty-opMode_Full_Color: #CCFFCC; - qproperty-opMode_NoTurtle_Color: #CCCCFF; - qproperty-opMode_Gaming_Color: #FFFFCC; - qproperty-opMode_Minimal_Color: #FFCCCC; -} -OpModeStatus[opMode="Full"] { - background: #CCFFCC; -} -OpModeStatus[opMode="NoTurtle"] { - background: #CCCCFF; -} -OpModeStatus[opMode="Gaming"] { - background: #FFFFCC; -} -OpModeStatus[opMode="Minimal"] { - background: #FFCCCC; -}