git.iko.soy/unity8
on xenial help sign in
left+right indicator labels
commit817b7c3d31686bdd7b2952e1ae0bb179a8d6601c authorNick Dedekind <nicholas.dedekind@gmail.com> dateFri 16 Aug 2013, 18:25 (13 years ago) parentca52a04
3 files changed+36−13
compare with xenial
unifiedsplit
Panel/Indicators/DefaultIndicatorWidget2.qml+17−4 plugins/Unity/Indicators/rootactionstate.cpp+13−6 plugins/Unity/Indicators/rootactionstate.h+6−3
Panel/Indicators/DefaultIndicatorWidget2.qml+17−4
@@ -26,7 +26,8 @@ Indicators.IndicatorWidget {
2626
2727 width: itemRow.width + units.gu(0.7)
2828
29− property alias label: itemLabel.text
29+ property alias leftLabel: itemLeftLabel.text
30+ property alias rightLabel: itemRightLabel.text
3031 property var icons: undefined
3132
3233 Row {
@@ -39,6 +40,17 @@ Indicators.IndicatorWidget {
3940 }
4041 spacing: units.gu(0.5)
4142
43+ Label {
44+ id: itemLeftLabel
45+ objectName: "leftLabel"
46+ color: Theme.palette.selected.backgroundText
47+ opacity: 0.8
48+ font.family: "Ubuntu"
49+ fontSize: "medium"
50+ anchors.verticalCenter: parent.verticalCenter
51+ visible: text != ""
52+ }
53+
4254 Row {
4355 width: childrenRect.width
4456 anchors {
@@ -63,8 +75,8 @@ Indicators.IndicatorWidget {
6375 }
6476
6577 Label {
66− id: itemLabel
67− objectName: "itemLabel"
78+ id: itemRightLabel
79+ objectName: "rightLabel"
6880 color: Theme.palette.selected.backgroundText
6981 opacity: 0.8
7082 font.family: "Ubuntu"
@@ -82,7 +94,8 @@ Indicators.IndicatorWidget {
8294 return;
8395 }
8496
85− label = actionState.label;
97+ leftLabel = actionState.leftLabel;
98+ rightLabel = actionState.rightLabel;
8699 icons = actionState.icons;
87100 enabled = actionState.visible;
88101 }
plugins/Unity/Indicators/rootactionstate.cpp+13−6
@@ -108,7 +108,14 @@ bool RootActionState::isValid() const
108108 return m_menu && m_menu->rowCount() > 0;
109109}
110110
111−QString RootActionState::label() const
111+QString RootActionState::leftLabel() const
112+{
113+ if (!isValid()) return QString();
114+
115+ return m_cachedState.value("pre-label", QVariant::fromValue(QString())).toString();
116+}
117+
118+QString RootActionState::rightLabel() const
112119{
113120 if (!isValid()) return QString();
114121
@@ -126,7 +133,7 @@ QString RootActionState::accessibleName() const
126133{
127134 if (!isValid()) return QString();
128135
129− return m_cachedState.value("accessible-name", QVariant::fromValue(QString())).toString();
136+ return m_cachedState.value("accessible-desc", QVariant::fromValue(QString())).toString();
130137}
131138
132139bool RootActionState::isVisible() const
@@ -204,7 +211,7 @@ QVariant RootActionState::toQVariant(GVariant* state) const
204211 // FIXME - should be sending a url.
205212 GIcon *gicon = g_icon_deserialize (vvalue);
206213 if (gicon) {
207− icons << iconUri(gicon) << iconUri(gicon);
214+ icons << iconUri(gicon);
208215 }
209216 qmap.insert("icons", icons);
210217
@@ -221,7 +228,7 @@ QVariant RootActionState::toQVariant(GVariant* state) const
221228 // FIXME - should be sending a url.
222229 GIcon *gicon = g_icon_deserialize (child);
223230 if (gicon) {
224− icons << iconUri(gicon) << iconUri(gicon);
231+ icons << iconUri(gicon);
225232 g_object_unref (gicon);
226233 }
227234 g_variant_unref(child);
@@ -252,12 +259,12 @@ QVariant RootActionState::toQVariant(GVariant* state) const
252259 &visible);
253260
254261 qmap["label"] = label ? QString::fromUtf8(label) : "";
255− qmap["accessible-name"] = accessible_name ? QString::fromUtf8(accessible_name) : "";
262+ qmap["accessible-desc"] = accessible_name ? QString::fromUtf8(accessible_name) : "";
256263 qmap["visible"] = visible;
257264
258265 gicon = g_icon_new_for_string (icon, NULL);
259266 if (gicon) {
260− qmap["icons"] = QStringList() << iconUri(gicon) << iconUri(gicon);
267+ qmap["icons"] = QStringList() << iconUri(gicon);
261268 g_object_unref (gicon);
262269 }
263270
plugins/Unity/Indicators/rootactionstate.h+6−3
@@ -32,7 +32,8 @@ class UNITYINDICATORS_EXPORT RootActionState : public ActionStateParser
3232 Q_PROPERTY(UnityMenuModel* menu READ menu WRITE setMenu NOTIFY menuChanged)
3333
3434 Q_PROPERTY(bool valid READ isValid NOTIFY validChanged)
35− Q_PROPERTY(QString label READ label NOTIFY labelChanged)
35+ Q_PROPERTY(QString leftLabel READ leftLabel NOTIFY leftLabelChanged)
36+ Q_PROPERTY(QString rightLabel READ rightLabel NOTIFY rightLabelChanged)
3637 Q_PROPERTY(QStringList icons READ icons NOTIFY iconsChanged)
3738 Q_PROPERTY(QString accessibleName READ accessibleName NOTIFY accessibleNameChanged)
3839 Q_PROPERTY(bool visible READ isVisible NOTIFY visibleChanged)
@@ -47,7 +48,8 @@ public:
4748 void setIndex(int index);
4849
4950 bool isValid() const;
50− QString label() const;
51+ QString leftLabel() const;
52+ QString rightLabel() const;
5153 QStringList icons() const;
5254 QString accessibleName() const;
5355 bool isVisible() const;
@@ -62,7 +64,8 @@ Q_SIGNALS:
6264 void indexChanged();
6365
6466 void validChanged();
65− void labelChanged();
67+ void leftLabelChanged();
68+ void rightLabelChanged();
6669 void iconsChanged();
6770 void accessibleNameChanged();
6871 void visibleChanged();