itdominator
/
pavucontrol
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rename more objects in the quest to get rid of duplicate IDs 

Continuing from the previous patch, this patch renames more objects in
pavucontrol.glade to get rid of duplicate IDs. nameLabel and iconImage
actually weren't any more duplicates, because the previous patch renamed
the corresponding IDs for devices and streams, but the card related
objects were renamed nevertheless to be more descriptive and consistent
with the IDs used by the device and stream widgets.
This commit is contained in:
Tanu Kaskinen 2018-11-21 11:59:15 +02:00
parent c760edaf24
commit 0047261f23
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/cardwidget.cc
View File

@ -30,9 +30,9 @@
CardWidget::CardWidget(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& x) : CardWidget::CardWidget(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& x) :
Gtk::VBox(cobject) { Gtk::VBox(cobject) {
x->get_widget("nameLabel", nameLabel); x->get_widget("cardNameLabel", nameLabel);
x->get_widget("profileList", profileList); x->get_widget("profileList", profileList);
x->get_widget("iconImage", iconImage); x->get_widget("cardIconImage", iconImage);
treeModel = Gtk::ListStore::create(profileModel); treeModel = Gtk::ListStore::create(profileModel);
profileList->set_model(treeModel); profileList->set_model(treeModel);

4
src/devicewidget.cc
View File

@ -41,8 +41,8 @@ DeviceWidget::DeviceWidget(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Buil
x->get_widget("deviceBoldNameLabel", boldNameLabel); x->get_widget("deviceBoldNameLabel", boldNameLabel);
x->get_widget("deviceIconImage", iconImage); x->get_widget("deviceIconImage", iconImage);
x->get_widget("lockToggleButton", lockToggleButton); x->get_widget("deviceLockToggleButton", lockToggleButton);
x->get_widget("muteToggleButton", muteToggleButton); x->get_widget("deviceMuteToggleButton", muteToggleButton);
x->get_widget("defaultToggleButton", defaultToggleButton); x->get_widget("defaultToggleButton", defaultToggleButton);
x->get_widget("portSelect", portSelect); x->get_widget("portSelect", portSelect);
x->get_widget("portList", portList); x->get_widget("portList", portList);

12
src/pavucontrol.glade
View File

@ -92,7 +92,7 @@
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="spacing">6</property> <property name="spacing">6</property>
<child> <child>
<object class="GtkImage" id="iconImage"> <object class="GtkImage" id="cardIconImage">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="xalign">0</property> <property name="xalign">0</property>
@ -109,7 +109,7 @@
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<child> <child>
<object class="GtkLabel" id="nameLabel"> <object class="GtkLabel" id="cardNameLabel">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="xalign">0</property> <property name="xalign">0</property>
@ -277,7 +277,7 @@
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="spacing">3</property> <property name="spacing">3</property>
<child> <child>
<object class="GtkToggleButton" id="muteToggleButton"> <object class="GtkToggleButton" id="deviceMuteToggleButton">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
@ -299,7 +299,7 @@
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkToggleButton" id="lockToggleButton"> <object class="GtkToggleButton" id="deviceLockToggleButton">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
@ -1524,7 +1524,7 @@
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="spacing">3</property> <property name="spacing">3</property>
<child> <child>
<object class="GtkToggleButton" id="muteToggleButton"> <object class="GtkToggleButton" id="streamMuteToggleButton">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
@ -1546,7 +1546,7 @@
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkToggleButton" id="lockToggleButton"> <object class="GtkToggleButton" id="streamLockToggleButton">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>

4
src/streamwidget.cc
View File

@ -39,8 +39,8 @@ StreamWidget::StreamWidget(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Buil
x->get_widget("streamBoldNameLabel", boldNameLabel); x->get_widget("streamBoldNameLabel", boldNameLabel);
x->get_widget("streamIconImage", iconImage); x->get_widget("streamIconImage", iconImage);
x->get_widget("lockToggleButton", lockToggleButton); x->get_widget("streamLockToggleButton", lockToggleButton);
x->get_widget("muteToggleButton", muteToggleButton); x->get_widget("streamMuteToggleButton", muteToggleButton);
x->get_widget("directionLabel", directionLabel); x->get_widget("directionLabel", directionLabel);
x->get_widget("deviceButton", deviceButton); x->get_widget("deviceButton", deviceButton);