e35ecd5468
The current Network panel is composed of a single stack and a treeview to select the currently visible stack page. Each stack page represents a connection or device. The new Network panel, however, has none of the concept of selectable pages. In the new layout, all connections and devices appear all at once in a more compact and simpler fashion. This commit, then, starts moving towards a unified, pageless panel by adding all the connections and devices to different stacks. These different stacks are transient to the network object, and are added at appropriate boxes, giving the panel a unified layout. This has some serious implications in the design of the current code. Most of the code removals were related to the treeview and different pages handling. No more tree model madness is present, and the devices are now stored in a plain simple GPtrArray. After this patch, NetObject:add_to_stack isn't a good code design choice anymore. This will be addressed in a future patch. https://bugzilla.gnome.org/show_bug.cgi?id=785581
81 lines
3.1 KiB
XML
81 lines
3.1 KiB
XML
<?xml version="1.0" encoding="UTF-8"?>
|
|
<interface>
|
|
<!-- interface-requires gtk+ 3.0 -->
|
|
<object class="GtkAdjustment" id="adjustment_proxy_port_ftp">
|
|
<property name="upper">65535</property>
|
|
<property name="step_increment">1</property>
|
|
</object>
|
|
<object class="GtkAdjustment" id="adjustment_proxy_port_http">
|
|
<property name="upper">65535</property>
|
|
<property name="step_increment">1</property>
|
|
</object>
|
|
<object class="GtkAdjustment" id="adjustment_proxy_port_https">
|
|
<property name="upper">65535</property>
|
|
<property name="step_increment">1</property>
|
|
</object>
|
|
<object class="GtkAdjustment" id="adjustment_proxy_port_socks">
|
|
<property name="upper">65535</property>
|
|
<property name="step_increment">1</property>
|
|
</object>
|
|
<object class="GtkListStore" id="liststore_devices">
|
|
<columns>
|
|
<!-- column-name icon -->
|
|
<column type="gchararray"/>
|
|
<!-- column-name object -->
|
|
<column type="GObject"/>
|
|
</columns>
|
|
</object>
|
|
<template class="CcNetworkPanel" parent="CcPanel">
|
|
<property name="visible">True</property>
|
|
<property name="can_focus">False</property>
|
|
<property name="margin">6</property>
|
|
<child>
|
|
<object class="GtkBox" id="main_box">
|
|
<property name="visible">True</property>
|
|
<property name="can_focus">False</property>
|
|
<property name="spacing">12</property>
|
|
<property name="orientation">vertical</property>
|
|
<child>
|
|
<object class="GtkBox">
|
|
<property name="visible">True</property>
|
|
<property name="can_focus">False</property>
|
|
<property name="spacing">3</property>
|
|
<property name="orientation">vertical</property>
|
|
|
|
<!-- Each GtkBox below will contain GtkStacks from the NetDevices -->
|
|
<child>
|
|
<object class="GtkBox">
|
|
<property name="visible">True</property>
|
|
<property name="can_focus">False</property>
|
|
<property name="orientation">vertical</property>
|
|
<child>
|
|
<object class="GtkBox" id="box_wired">
|
|
<property name="visible">True</property>
|
|
<property name="can_focus">False</property>
|
|
<property name="orientation">vertical</property>
|
|
</object>
|
|
</child>
|
|
<child>
|
|
<object class="GtkBox" id="box_vpn">
|
|
<property name="visible">True</property>
|
|
<property name="can_focus">False</property>
|
|
<property name="orientation">vertical</property>
|
|
</object>
|
|
</child>
|
|
<child>
|
|
<object class="GtkBox" id="box_proxy">
|
|
<property name="visible">True</property>
|
|
<property name="can_focus">False</property>
|
|
<property name="orientation">vertical</property>
|
|
</object>
|
|
</child>
|
|
</object>
|
|
</child>
|
|
</object>
|
|
</child>
|
|
</object>
|
|
</child>
|
|
</template>
|
|
<object class="GtkSizeGroup" id="sizegroup">
|
|
</object>
|
|
</interface>
|