Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GTK3: convert glade files of merge to correct expand

Browse Source 
svn: r20313
This commit is contained in:
Benny Malengier 2012-09-02 11:38:53 +00:00
parent 9734eba3ca
commit 5f74964ec5
9 changed files with 214 additions and 191 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/gui/glade/mergecitation.glade
View File

@ -120,6 +120,7 @@ primary data for the merged citation.</property>
<property name="draw_indicator">True</property>
<child>
<object class="GtkLabel" id="label_handle_btn1">
<property name="width_request">300</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="wrap">True</property>
@ -144,6 +145,7 @@ primary data for the merged citation.</property>
<property name="group">handle_btn1</property>
<child>
<object class="GtkLabel" id="label_handle_btn2">
<property name="width_request">300</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="wrap">True</property>
@ -202,7 +204,7 @@ primary data for the merged citation.</property>
</object>
<packing>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -216,7 +218,7 @@ primary data for the merged citation.</property>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -235,7 +237,7 @@ primary data for the merged citation.</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -257,7 +259,7 @@ primary data for the merged citation.</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -276,7 +278,7 @@ primary data for the merged citation.</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -298,7 +300,7 @@ primary data for the merged citation.</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -317,7 +319,7 @@ primary data for the merged citation.</property>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -339,7 +341,7 @@ primary data for the merged citation.</property>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -358,7 +360,7 @@ primary data for the merged citation.</property>
<property name="top_attach">5</property>
<property name="bottom_attach">6</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -380,7 +382,7 @@ primary data for the merged citation.</property>
<property name="top_attach">5</property>
<property name="bottom_attach">6</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -394,7 +396,7 @@ primary data for the merged citation.</property>
<property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -408,7 +410,7 @@ primary data for the merged citation.</property>
<property name="right_attach">4</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -422,7 +424,7 @@ primary data for the merged citation.</property>
<property name="right_attach">2</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -436,7 +438,7 @@ primary data for the merged citation.</property>
<property name="right_attach">4</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -450,7 +452,7 @@ primary data for the merged citation.</property>
<property name="right_attach">2</property>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -464,7 +466,7 @@ primary data for the merged citation.</property>
<property name="right_attach">4</property>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -478,7 +480,7 @@ primary data for the merged citation.</property>
<property name="right_attach">2</property>
<property name="top_attach">5</property>
<property name="bottom_attach">6</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -495,7 +497,7 @@ primary data for the merged citation.</property>
<property name="right_attach">4</property>
<property name="top_attach">5</property>
<property name="bottom_attach">6</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>

80
src/gui/glade/mergedata.glade
View File

@ -11,6 +11,7 @@
<object class="GtkBox" id="dialog-vbox3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">8</property>
<child internal-child="action_area">
<object class="GtkButtonBox" id="dialog-action_area3">
@ -180,8 +181,8 @@
<property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options"/>
<property name="y_options"/>
<property name="x_options"></property>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -201,8 +202,8 @@
<packing>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options"/>
<property name="y_options"/>
<property name="x_options"></property>
<property name="y_options"></property>
</packing>
</child>
</object>
@ -237,6 +238,7 @@
<object class="GtkBox" id="vbox4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">8</property>
<child internal-child="action_area">
<object class="GtkButtonBox" id="hbuttonbox1">
@ -350,7 +352,7 @@
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -366,7 +368,7 @@
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -383,7 +385,7 @@
</object>
<packing>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="y_options"></property>
<property name="x_padding">5</property>
<property name="y_padding">5</property>
</packing>
@ -404,7 +406,7 @@
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="y_options"></property>
<property name="x_padding">5</property>
<property name="y_padding">5</property>
</packing>
@ -440,6 +442,7 @@
<object class="GtkBox" id="dialog-vbox2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">8</property>
<child internal-child="action_area">
<object class="GtkButtonBox" id="dialog-action_area2">
@ -558,7 +561,7 @@
<property name="right_attach">3</property>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -574,7 +577,7 @@
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -590,7 +593,7 @@
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -604,7 +607,7 @@
<packing>
<property name="right_attach">3</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -626,7 +629,7 @@
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -648,7 +651,7 @@
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -670,7 +673,7 @@
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
</object>
@ -703,6 +706,7 @@
<object class="GtkBox" id="dialog-vbox4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child internal-child="action_area">
<object class="GtkButtonBox" id="dialog-action_area4">
<property name="visible">True</property>
@ -837,7 +841,7 @@
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -854,7 +858,7 @@
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -875,7 +879,7 @@
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -897,7 +901,7 @@
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -918,7 +922,7 @@
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -940,7 +944,7 @@
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -961,7 +965,7 @@
<property name="top_attach">4</property>
<property name="bottom_attach">5</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -983,7 +987,7 @@
<property name="top_attach">4</property>
<property name="bottom_attach">5</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -1004,7 +1008,7 @@
<property name="top_attach">5</property>
<property name="bottom_attach">6</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -1026,7 +1030,7 @@
<property name="top_attach">5</property>
<property name="bottom_attach">6</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -1047,7 +1051,7 @@
<property name="top_attach">6</property>
<property name="bottom_attach">7</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -1069,7 +1073,7 @@
<property name="top_attach">6</property>
<property name="bottom_attach">7</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -1080,7 +1084,7 @@
</object>
<packing>
<property name="right_attach">7</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -1095,7 +1099,7 @@
<property name="right_attach">3</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -1110,7 +1114,7 @@
<property name="right_attach">7</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -1125,7 +1129,7 @@
<property name="right_attach">3</property>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -1140,7 +1144,7 @@
<property name="right_attach">7</property>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -1155,7 +1159,7 @@
<property name="right_attach">3</property>
<property name="top_attach">4</property>
<property name="bottom_attach">5</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -1170,7 +1174,7 @@
<property name="right_attach">7</property>
<property name="top_attach">4</property>
<property name="bottom_attach">5</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -1185,7 +1189,7 @@
<property name="right_attach">3</property>
<property name="top_attach">5</property>
<property name="bottom_attach">6</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -1200,7 +1204,7 @@
<property name="right_attach">7</property>
<property name="top_attach">5</property>
<property name="bottom_attach">6</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -1215,7 +1219,7 @@
<property name="right_attach">3</property>
<property name="top_attach">6</property>
<property name="bottom_attach">7</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -1230,7 +1234,7 @@
<property name="right_attach">7</property>
<property name="top_attach">6</property>
<property name="bottom_attach">7</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
</object>

46
src/gui/glade/mergeevent.glade
View File

@ -120,6 +120,7 @@ primary data for the merged event.</property>
<property name="draw_indicator">True</property>
<child>
<object class="GtkLabel" id="label_handle_btn1">
<property name="width_request">300</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="wrap">True</property>
@ -144,6 +145,7 @@ primary data for the merged event.</property>
<property name="group">handle_btn1</property>
<child>
<object class="GtkLabel" id="label_handle_btn2">
<property name="width_request">300</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="wrap">True</property>
@ -190,7 +192,7 @@ primary data for the merged event.</property>
</object>
<packing>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -204,7 +206,7 @@ primary data for the merged event.</property>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -223,7 +225,7 @@ primary data for the merged event.</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -245,7 +247,7 @@ primary data for the merged event.</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -264,7 +266,7 @@ primary data for the merged event.</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -286,7 +288,7 @@ primary data for the merged event.</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -305,7 +307,7 @@ primary data for the merged event.</property>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -327,7 +329,7 @@ primary data for the merged event.</property>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -346,7 +348,7 @@ primary data for the merged event.</property>
<property name="top_attach">4</property>
<property name="bottom_attach">5</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -368,7 +370,7 @@ primary data for the merged event.</property>
<property name="top_attach">4</property>
<property name="bottom_attach">5</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -387,7 +389,7 @@ primary data for the merged event.</property>
<property name="top_attach">5</property>
<property name="bottom_attach">6</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -409,7 +411,7 @@ primary data for the merged event.</property>
<property name="top_attach">5</property>
<property name="bottom_attach">6</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -423,7 +425,7 @@ primary data for the merged event.</property>
<property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -437,7 +439,7 @@ primary data for the merged event.</property>
<property name="right_attach">4</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -451,7 +453,7 @@ primary data for the merged event.</property>
<property name="right_attach">2</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -465,7 +467,7 @@ primary data for the merged event.</property>
<property name="right_attach">4</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -479,7 +481,7 @@ primary data for the merged event.</property>
<property name="right_attach">2</property>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -493,7 +495,7 @@ primary data for the merged event.</property>
<property name="right_attach">4</property>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -507,7 +509,7 @@ primary data for the merged event.</property>
<property name="right_attach">2</property>
<property name="top_attach">4</property>
<property name="bottom_attach">5</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -521,7 +523,7 @@ primary data for the merged event.</property>
<property name="right_attach">4</property>
<property name="top_attach">4</property>
<property name="bottom_attach">5</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -535,7 +537,7 @@ primary data for the merged event.</property>
<property name="right_attach">2</property>
<property name="top_attach">5</property>
<property name="bottom_attach">6</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -552,7 +554,7 @@ primary data for the merged event.</property>
<property name="right_attach">4</property>
<property name="top_attach">5</property>
<property name="bottom_attach">6</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>

43
src/gui/glade/mergefamily.glade
View File

@ -96,6 +96,7 @@
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="label" translatable="yes">Select the family that will provide the
primary data for the merged family.</property>
</object>
@ -115,11 +116,13 @@ primary data for the merged family.</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="hexpand">True</property>
<property name="use_action_appearance">False</property>
<property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
<child>
<object class="GtkLabel" id="label_handle_btn1">
<property name="width_request">400</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="wrap">True</property>
@ -138,12 +141,14 @@ primary data for the merged family.</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="hexpand">True</property>
<property name="use_action_appearance">False</property>
<property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
<property name="group">handle_btn1</property>
<child>
<object class="GtkLabel" id="label_handle_btn2">
<property name="width_request">400</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="wrap">True</property>
@ -190,7 +195,7 @@ primary data for the merged family.</property>
</object>
<packing>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -204,7 +209,7 @@ primary data for the merged family.</property>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -223,7 +228,7 @@ primary data for the merged family.</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -245,7 +250,7 @@ primary data for the merged family.</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -264,7 +269,7 @@ primary data for the merged family.</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -286,7 +291,7 @@ primary data for the merged family.</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -305,7 +310,7 @@ primary data for the merged family.</property>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -327,7 +332,7 @@ primary data for the merged family.</property>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -346,7 +351,7 @@ primary data for the merged family.</property>
<property name="top_attach">4</property>
<property name="bottom_attach">5</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -368,7 +373,7 @@ primary data for the merged family.</property>
<property name="top_attach">4</property>
<property name="bottom_attach">5</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -382,7 +387,7 @@ primary data for the merged family.</property>
<property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -396,7 +401,7 @@ primary data for the merged family.</property>
<property name="right_attach">4</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -410,7 +415,7 @@ primary data for the merged family.</property>
<property name="right_attach">2</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -424,7 +429,7 @@ primary data for the merged family.</property>
<property name="right_attach">4</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -438,7 +443,7 @@ primary data for the merged family.</property>
<property name="right_attach">2</property>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -452,7 +457,7 @@ primary data for the merged family.</property>
<property name="right_attach">4</property>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -466,7 +471,7 @@ primary data for the merged family.</property>
<property name="right_attach">2</property>
<property name="top_attach">4</property>
<property name="bottom_attach">5</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -483,7 +488,7 @@ primary data for the merged family.</property>
<property name="right_attach">4</property>
<property name="top_attach">4</property>
<property name="bottom_attach">5</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -528,7 +533,7 @@ primary data for the merged family.</property>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>

38
src/gui/glade/mergemedia.glade
View File

@ -120,6 +120,7 @@ primary data for the merged object.</property>
<property name="draw_indicator">True</property>
<child>
<object class="GtkLabel" id="label_handle_btn1">
<property name="width_request">300</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="wrap">True</property>
@ -144,6 +145,7 @@ primary data for the merged object.</property>
<property name="group">handle_btn1</property>
<child>
<object class="GtkLabel" id="label_handle_btn2">
<property name="width_request">300</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="wrap">True</property>
@ -190,7 +192,7 @@ primary data for the merged object.</property>
</object>
<packing>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -204,7 +206,7 @@ primary data for the merged object.</property>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -223,7 +225,7 @@ primary data for the merged object.</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -245,7 +247,7 @@ primary data for the merged object.</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -264,7 +266,7 @@ primary data for the merged object.</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -286,7 +288,7 @@ primary data for the merged object.</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -305,7 +307,7 @@ primary data for the merged object.</property>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -327,7 +329,7 @@ primary data for the merged object.</property>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -346,7 +348,7 @@ primary data for the merged object.</property>
<property name="top_attach">4</property>
<property name="bottom_attach">5</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -368,7 +370,7 @@ primary data for the merged object.</property>
<property name="top_attach">4</property>
<property name="bottom_attach">5</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -382,7 +384,7 @@ primary data for the merged object.</property>
<property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -396,7 +398,7 @@ primary data for the merged object.</property>
<property name="right_attach">4</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -410,7 +412,7 @@ primary data for the merged object.</property>
<property name="right_attach">2</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -424,7 +426,7 @@ primary data for the merged object.</property>
<property name="right_attach">4</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -438,7 +440,7 @@ primary data for the merged object.</property>
<property name="right_attach">2</property>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -452,7 +454,7 @@ primary data for the merged object.</property>
<property name="right_attach">4</property>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -466,7 +468,7 @@ primary data for the merged object.</property>
<property name="right_attach">2</property>
<property name="top_attach">4</property>
<property name="bottom_attach">5</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -483,7 +485,7 @@ primary data for the merged object.</property>
<property name="right_attach">4</property>
<property name="top_attach">4</property>
<property name="bottom_attach">5</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>

38
src/gui/glade/mergenote.glade
View File

@ -120,6 +120,7 @@ primary data for the merged note.</property>
<property name="draw_indicator">True</property>
<child>
<object class="GtkLabel" id="label_handle_btn1">
<property name="width_request">300</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="wrap">True</property>
@ -144,6 +145,7 @@ primary data for the merged note.</property>
<property name="group">handle_btn1</property>
<child>
<object class="GtkLabel" id="label_handle_btn2">
<property name="width_request">300</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="wrap">True</property>
@ -190,7 +192,7 @@ primary data for the merged note.</property>
</object>
<packing>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -204,7 +206,7 @@ primary data for the merged note.</property>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -223,7 +225,7 @@ primary data for the merged note.</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -245,7 +247,7 @@ primary data for the merged note.</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -264,7 +266,7 @@ primary data for the merged note.</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -286,7 +288,7 @@ primary data for the merged note.</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -305,7 +307,7 @@ primary data for the merged note.</property>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -327,7 +329,7 @@ primary data for the merged note.</property>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -346,7 +348,7 @@ primary data for the merged note.</property>
<property name="top_attach">4</property>
<property name="bottom_attach">5</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -368,7 +370,7 @@ primary data for the merged note.</property>
<property name="top_attach">4</property>
<property name="bottom_attach">5</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -389,7 +391,7 @@ primary data for the merged note.</property>
<property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -410,7 +412,7 @@ primary data for the merged note.</property>
<property name="right_attach">4</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -424,7 +426,7 @@ primary data for the merged note.</property>
<property name="right_attach">2</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -438,7 +440,7 @@ primary data for the merged note.</property>
<property name="right_attach">4</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -452,7 +454,7 @@ primary data for the merged note.</property>
<property name="right_attach">2</property>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -466,7 +468,7 @@ primary data for the merged note.</property>
<property name="right_attach">4</property>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -480,7 +482,7 @@ primary data for the merged note.</property>
<property name="right_attach">2</property>
<property name="top_attach">4</property>
<property name="bottom_attach">5</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -497,7 +499,7 @@ primary data for the merged note.</property>
<property name="right_attach">4</property>
<property name="top_attach">4</property>
<property name="bottom_attach">5</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>

46
src/gui/glade/mergeplace.glade
View File

@ -120,6 +120,7 @@ primary data for the merged place.</property>
<property name="draw_indicator">True</property>
<child>
<object class="GtkLabel" id="label_handle_btn1">
<property name="width_request">300</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="wrap">True</property>
@ -144,6 +145,7 @@ primary data for the merged place.</property>
<property name="group">handle_btn1</property>
<child>
<object class="GtkLabel" id="label_handle_btn2">
<property name="width_request">300</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="wrap">True</property>
@ -190,7 +192,7 @@ primary data for the merged place.</property>
</object>
<packing>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -204,7 +206,7 @@ primary data for the merged place.</property>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -223,7 +225,7 @@ primary data for the merged place.</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -245,7 +247,7 @@ primary data for the merged place.</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -264,7 +266,7 @@ primary data for the merged place.</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -286,7 +288,7 @@ primary data for the merged place.</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -305,7 +307,7 @@ primary data for the merged place.</property>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -327,7 +329,7 @@ primary data for the merged place.</property>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -346,7 +348,7 @@ primary data for the merged place.</property>
<property name="top_attach">4</property>
<property name="bottom_attach">5</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -368,7 +370,7 @@ primary data for the merged place.</property>
<property name="top_attach">4</property>
<property name="bottom_attach">5</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -387,7 +389,7 @@ primary data for the merged place.</property>
<property name="top_attach">5</property>
<property name="bottom_attach">6</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -409,7 +411,7 @@ primary data for the merged place.</property>
<property name="top_attach">5</property>
<property name="bottom_attach">6</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -423,7 +425,7 @@ primary data for the merged place.</property>
<property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -437,7 +439,7 @@ primary data for the merged place.</property>
<property name="right_attach">4</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -451,7 +453,7 @@ primary data for the merged place.</property>
<property name="right_attach">2</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -465,7 +467,7 @@ primary data for the merged place.</property>
<property name="right_attach">4</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -479,7 +481,7 @@ primary data for the merged place.</property>
<property name="right_attach">2</property>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -493,7 +495,7 @@ primary data for the merged place.</property>
<property name="right_attach">4</property>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -513,7 +515,7 @@ primary data for the merged place.</property>
<property name="right_attach">2</property>
<property name="top_attach">4</property>
<property name="bottom_attach">5</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -533,7 +535,7 @@ primary data for the merged place.</property>
<property name="right_attach">4</property>
<property name="top_attach">4</property>
<property name="bottom_attach">5</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -547,7 +549,7 @@ primary data for the merged place.</property>
<property name="right_attach">2</property>
<property name="top_attach">5</property>
<property name="bottom_attach">6</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -564,7 +566,7 @@ primary data for the merged place.</property>
<property name="right_attach">4</property>
<property name="top_attach">5</property>
<property name="bottom_attach">6</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>

30
src/gui/glade/mergerepository.glade
View File

@ -120,6 +120,7 @@ primary data for the merged repository.</property>
<property name="draw_indicator">True</property>
<child>
<object class="GtkLabel" id="label_handle_btn1">
<property name="width_request">300</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="wrap">True</property>
@ -144,6 +145,7 @@ primary data for the merged repository.</property>
<property name="group">handle_btn1</property>
<child>
<object class="GtkLabel" id="label_handle_btn2">
<property name="width_request">300</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="wrap">True</property>
@ -190,7 +192,7 @@ primary data for the merged repository.</property>
</object>
<packing>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -204,7 +206,7 @@ primary data for the merged repository.</property>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -223,7 +225,7 @@ primary data for the merged repository.</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -245,7 +247,7 @@ primary data for the merged repository.</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -264,7 +266,7 @@ primary data for the merged repository.</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -286,7 +288,7 @@ primary data for the merged repository.</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -305,7 +307,7 @@ primary data for the merged repository.</property>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -327,7 +329,7 @@ primary data for the merged repository.</property>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -341,7 +343,7 @@ primary data for the merged repository.</property>
<property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -355,7 +357,7 @@ primary data for the merged repository.</property>
<property name="right_attach">4</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -369,7 +371,7 @@ primary data for the merged repository.</property>
<property name="right_attach">2</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -383,7 +385,7 @@ primary data for the merged repository.</property>
<property name="right_attach">4</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -397,7 +399,7 @@ primary data for the merged repository.</property>
<property name="right_attach">2</property>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -414,7 +416,7 @@ primary data for the merged repository.</property>
<property name="right_attach">4</property>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>

46
src/gui/glade/mergesource.glade
View File

@ -120,6 +120,7 @@ primary data for the merged source.</property>
<property name="draw_indicator">True</property>
<child>
<object class="GtkLabel" id="label_handle_btn1">
<property name="width_request">300</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="wrap">True</property>
@ -144,6 +145,7 @@ primary data for the merged source.</property>
<property name="group">handle_btn1</property>
<child>
<object class="GtkLabel" id="label_handle_btn2">
<property name="width_request">300</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="wrap">True</property>
@ -190,7 +192,7 @@ primary data for the merged source.</property>
</object>
<packing>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -204,7 +206,7 @@ primary data for the merged source.</property>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -223,7 +225,7 @@ primary data for the merged source.</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -245,7 +247,7 @@ primary data for the merged source.</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -264,7 +266,7 @@ primary data for the merged source.</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -286,7 +288,7 @@ primary data for the merged source.</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -305,7 +307,7 @@ primary data for the merged source.</property>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -327,7 +329,7 @@ primary data for the merged source.</property>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -346,7 +348,7 @@ primary data for the merged source.</property>
<property name="top_attach">4</property>
<property name="bottom_attach">5</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -368,7 +370,7 @@ primary data for the merged source.</property>
<property name="top_attach">4</property>
<property name="bottom_attach">5</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -387,7 +389,7 @@ primary data for the merged source.</property>
<property name="top_attach">5</property>
<property name="bottom_attach">6</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -409,7 +411,7 @@ primary data for the merged source.</property>
<property name="top_attach">5</property>
<property name="bottom_attach">6</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -423,7 +425,7 @@ primary data for the merged source.</property>
<property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -437,7 +439,7 @@ primary data for the merged source.</property>
<property name="right_attach">4</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -451,7 +453,7 @@ primary data for the merged source.</property>
<property name="right_attach">2</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -465,7 +467,7 @@ primary data for the merged source.</property>
<property name="right_attach">4</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -479,7 +481,7 @@ primary data for the merged source.</property>
<property name="right_attach">2</property>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -493,7 +495,7 @@ primary data for the merged source.</property>
<property name="right_attach">4</property>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -507,7 +509,7 @@ primary data for the merged source.</property>
<property name="right_attach">2</property>
<property name="top_attach">4</property>
<property name="bottom_attach">5</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -521,7 +523,7 @@ primary data for the merged source.</property>
<property name="right_attach">4</property>
<property name="top_attach">4</property>
<property name="bottom_attach">5</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -535,7 +537,7 @@ primary data for the merged source.</property>
<property name="right_attach">2</property>
<property name="top_attach">5</property>
<property name="bottom_attach">6</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>
@ -552,7 +554,7 @@ primary data for the merged source.</property>
<property name="right_attach">4</property>
<property name="top_attach">5</property>
<property name="bottom_attach">6</property>
<property name="y_options"/>
<property name="y_options"></property>
</packing>
</child>
<child>