From 5f74964ec53f3c63f392fe00d7ba4ae2809ec592 Mon Sep 17 00:00:00 2001 From: Benny Malengier Date: Sun, 2 Sep 2012 11:38:53 +0000 Subject: [PATCH] GTK3: convert glade files of merge to correct expand svn: r20313 --- src/gui/glade/mergecitation.glade | 38 +++++++------- src/gui/glade/mergedata.glade | 80 +++++++++++++++-------------- src/gui/glade/mergeevent.glade | 46 +++++++++-------- src/gui/glade/mergefamily.glade | 43 +++++++++------- src/gui/glade/mergemedia.glade | 38 +++++++------- src/gui/glade/mergenote.glade | 38 +++++++------- src/gui/glade/mergeplace.glade | 46 +++++++++-------- src/gui/glade/mergerepository.glade | 30 ++++++----- src/gui/glade/mergesource.glade | 46 +++++++++-------- 9 files changed, 214 insertions(+), 191 deletions(-) diff --git a/src/gui/glade/mergecitation.glade b/src/gui/glade/mergecitation.glade index 86355929b..e088a6e33 100644 --- a/src/gui/glade/mergecitation.glade +++ b/src/gui/glade/mergecitation.glade @@ -120,6 +120,7 @@ primary data for the merged citation. True + 300 True False True @@ -144,6 +145,7 @@ primary data for the merged citation. handle_btn1 + 300 True False True @@ -202,7 +204,7 @@ primary data for the merged citation. GTK_FILL - + @@ -216,7 +218,7 @@ primary data for the merged citation. 2 3 GTK_FILL - + @@ -235,7 +237,7 @@ primary data for the merged citation. 1 2 GTK_FILL - + @@ -257,7 +259,7 @@ primary data for the merged citation. 1 2 GTK_FILL - + @@ -276,7 +278,7 @@ primary data for the merged citation. 2 3 GTK_FILL - + @@ -298,7 +300,7 @@ primary data for the merged citation. 2 3 GTK_FILL - + @@ -317,7 +319,7 @@ primary data for the merged citation. 3 4 GTK_FILL - + @@ -339,7 +341,7 @@ primary data for the merged citation. 3 4 GTK_FILL - + @@ -358,7 +360,7 @@ primary data for the merged citation. 5 6 GTK_FILL - + @@ -380,7 +382,7 @@ primary data for the merged citation. 5 6 GTK_FILL - + @@ -394,7 +396,7 @@ primary data for the merged citation. 2 1 2 - + @@ -408,7 +410,7 @@ primary data for the merged citation. 4 1 2 - + @@ -422,7 +424,7 @@ primary data for the merged citation. 2 2 3 - + @@ -436,7 +438,7 @@ primary data for the merged citation. 4 2 3 - + @@ -450,7 +452,7 @@ primary data for the merged citation. 2 3 4 - + @@ -464,7 +466,7 @@ primary data for the merged citation. 4 3 4 - + @@ -478,7 +480,7 @@ primary data for the merged citation. 2 5 6 - + @@ -495,7 +497,7 @@ primary data for the merged citation. 4 5 6 - + diff --git a/src/gui/glade/mergedata.glade b/src/gui/glade/mergedata.glade index dfaa62a61..80c4ed944 100644 --- a/src/gui/glade/mergedata.glade +++ b/src/gui/glade/mergedata.glade @@ -11,6 +11,7 @@ True False + vertical 8 @@ -180,8 +181,8 @@ 2 1 2 - - + + @@ -201,8 +202,8 @@ 1 2 - - + + @@ -237,6 +238,7 @@ True False + vertical 8 @@ -350,7 +352,7 @@ 1 2 GTK_FILL - + @@ -366,7 +368,7 @@ 1 2 GTK_FILL - + @@ -383,7 +385,7 @@ GTK_FILL - + 5 5 @@ -404,7 +406,7 @@ 1 2 GTK_FILL - + 5 5 @@ -440,6 +442,7 @@ True False + vertical 8 @@ -558,7 +561,7 @@ 3 3 4 - + @@ -574,7 +577,7 @@ 1 2 GTK_FILL - + @@ -590,7 +593,7 @@ 2 3 GTK_FILL - + @@ -604,7 +607,7 @@ 3 GTK_FILL - + @@ -626,7 +629,7 @@ 1 2 GTK_FILL - + @@ -648,7 +651,7 @@ 2 3 GTK_FILL - + @@ -670,7 +673,7 @@ 3 4 GTK_FILL - + @@ -703,6 +706,7 @@ True False + vertical True @@ -837,7 +841,7 @@ 1 2 GTK_FILL - + @@ -854,7 +858,7 @@ 1 2 GTK_FILL - + @@ -875,7 +879,7 @@ 2 3 GTK_FILL - + @@ -897,7 +901,7 @@ 2 3 GTK_FILL - + @@ -918,7 +922,7 @@ 3 4 GTK_FILL - + @@ -940,7 +944,7 @@ 3 4 GTK_FILL - + @@ -961,7 +965,7 @@ 4 5 GTK_FILL - + @@ -983,7 +987,7 @@ 4 5 GTK_FILL - + @@ -1004,7 +1008,7 @@ 5 6 GTK_FILL - + @@ -1026,7 +1030,7 @@ 5 6 GTK_FILL - + @@ -1047,7 +1051,7 @@ 6 7 GTK_FILL - + @@ -1069,7 +1073,7 @@ 6 7 GTK_FILL - + @@ -1080,7 +1084,7 @@ 7 - + @@ -1095,7 +1099,7 @@ 3 2 3 - + @@ -1110,7 +1114,7 @@ 7 2 3 - + @@ -1125,7 +1129,7 @@ 3 3 4 - + @@ -1140,7 +1144,7 @@ 7 3 4 - + @@ -1155,7 +1159,7 @@ 3 4 5 - + @@ -1170,7 +1174,7 @@ 7 4 5 - + @@ -1185,7 +1189,7 @@ 3 5 6 - + @@ -1200,7 +1204,7 @@ 7 5 6 - + @@ -1215,7 +1219,7 @@ 3 6 7 - + @@ -1230,7 +1234,7 @@ 7 6 7 - + diff --git a/src/gui/glade/mergeevent.glade b/src/gui/glade/mergeevent.glade index 94ae568ef..f8e8b258f 100644 --- a/src/gui/glade/mergeevent.glade +++ b/src/gui/glade/mergeevent.glade @@ -120,6 +120,7 @@ primary data for the merged event. True + 300 True False True @@ -144,6 +145,7 @@ primary data for the merged event. handle_btn1 + 300 True False True @@ -190,7 +192,7 @@ primary data for the merged event. GTK_FILL - + @@ -204,7 +206,7 @@ primary data for the merged event. 2 3 GTK_FILL - + @@ -223,7 +225,7 @@ primary data for the merged event. 1 2 GTK_FILL - + @@ -245,7 +247,7 @@ primary data for the merged event. 1 2 GTK_FILL - + @@ -264,7 +266,7 @@ primary data for the merged event. 2 3 GTK_FILL - + @@ -286,7 +288,7 @@ primary data for the merged event. 2 3 GTK_FILL - + @@ -305,7 +307,7 @@ primary data for the merged event. 3 4 GTK_FILL - + @@ -327,7 +329,7 @@ primary data for the merged event. 3 4 GTK_FILL - + @@ -346,7 +348,7 @@ primary data for the merged event. 4 5 GTK_FILL - + @@ -368,7 +370,7 @@ primary data for the merged event. 4 5 GTK_FILL - + @@ -387,7 +389,7 @@ primary data for the merged event. 5 6 GTK_FILL - + @@ -409,7 +411,7 @@ primary data for the merged event. 5 6 GTK_FILL - + @@ -423,7 +425,7 @@ primary data for the merged event. 2 1 2 - + @@ -437,7 +439,7 @@ primary data for the merged event. 4 1 2 - + @@ -451,7 +453,7 @@ primary data for the merged event. 2 2 3 - + @@ -465,7 +467,7 @@ primary data for the merged event. 4 2 3 - + @@ -479,7 +481,7 @@ primary data for the merged event. 2 3 4 - + @@ -493,7 +495,7 @@ primary data for the merged event. 4 3 4 - + @@ -507,7 +509,7 @@ primary data for the merged event. 2 4 5 - + @@ -521,7 +523,7 @@ primary data for the merged event. 4 4 5 - + @@ -535,7 +537,7 @@ primary data for the merged event. 2 5 6 - + @@ -552,7 +554,7 @@ primary data for the merged event. 4 5 6 - + diff --git a/src/gui/glade/mergefamily.glade b/src/gui/glade/mergefamily.glade index 3acd570a0..81ef61b43 100644 --- a/src/gui/glade/mergefamily.glade +++ b/src/gui/glade/mergefamily.glade @@ -96,6 +96,7 @@ True False + True Select the family that will provide the primary data for the merged family. @@ -115,11 +116,13 @@ primary data for the merged family. True True False + True False 0.5 True + 400 True False True @@ -138,12 +141,14 @@ primary data for the merged family. True True False + True False 0.5 True handle_btn1 + 400 True False True @@ -190,7 +195,7 @@ primary data for the merged family. GTK_FILL - + @@ -204,7 +209,7 @@ primary data for the merged family. 2 3 GTK_FILL - + @@ -223,7 +228,7 @@ primary data for the merged family. 1 2 GTK_FILL - + @@ -245,7 +250,7 @@ primary data for the merged family. 1 2 GTK_FILL - + @@ -264,7 +269,7 @@ primary data for the merged family. 2 3 GTK_FILL - + @@ -286,7 +291,7 @@ primary data for the merged family. 2 3 GTK_FILL - + @@ -305,7 +310,7 @@ primary data for the merged family. 3 4 GTK_FILL - + @@ -327,7 +332,7 @@ primary data for the merged family. 3 4 GTK_FILL - + @@ -346,7 +351,7 @@ primary data for the merged family. 4 5 GTK_FILL - + @@ -368,7 +373,7 @@ primary data for the merged family. 4 5 GTK_FILL - + @@ -382,7 +387,7 @@ primary data for the merged family. 2 1 2 - + @@ -396,7 +401,7 @@ primary data for the merged family. 4 1 2 - + @@ -410,7 +415,7 @@ primary data for the merged family. 2 2 3 - + @@ -424,7 +429,7 @@ primary data for the merged family. 4 2 3 - + @@ -438,7 +443,7 @@ primary data for the merged family. 2 3 4 - + @@ -452,7 +457,7 @@ primary data for the merged family. 4 3 4 - + @@ -466,7 +471,7 @@ primary data for the merged family. 2 4 5 - + @@ -483,7 +488,7 @@ primary data for the merged family. 4 4 5 - + @@ -528,7 +533,7 @@ primary data for the merged family. - False + True True 1 diff --git a/src/gui/glade/mergemedia.glade b/src/gui/glade/mergemedia.glade index 27e408d78..9ac5be113 100644 --- a/src/gui/glade/mergemedia.glade +++ b/src/gui/glade/mergemedia.glade @@ -120,6 +120,7 @@ primary data for the merged object. True + 300 True False True @@ -144,6 +145,7 @@ primary data for the merged object. handle_btn1 + 300 True False True @@ -190,7 +192,7 @@ primary data for the merged object. GTK_FILL - + @@ -204,7 +206,7 @@ primary data for the merged object. 2 3 GTK_FILL - + @@ -223,7 +225,7 @@ primary data for the merged object. 1 2 GTK_FILL - + @@ -245,7 +247,7 @@ primary data for the merged object. 1 2 GTK_FILL - + @@ -264,7 +266,7 @@ primary data for the merged object. 2 3 GTK_FILL - + @@ -286,7 +288,7 @@ primary data for the merged object. 2 3 GTK_FILL - + @@ -305,7 +307,7 @@ primary data for the merged object. 3 4 GTK_FILL - + @@ -327,7 +329,7 @@ primary data for the merged object. 3 4 GTK_FILL - + @@ -346,7 +348,7 @@ primary data for the merged object. 4 5 GTK_FILL - + @@ -368,7 +370,7 @@ primary data for the merged object. 4 5 GTK_FILL - + @@ -382,7 +384,7 @@ primary data for the merged object. 2 1 2 - + @@ -396,7 +398,7 @@ primary data for the merged object. 4 1 2 - + @@ -410,7 +412,7 @@ primary data for the merged object. 2 2 3 - + @@ -424,7 +426,7 @@ primary data for the merged object. 4 2 3 - + @@ -438,7 +440,7 @@ primary data for the merged object. 2 3 4 - + @@ -452,7 +454,7 @@ primary data for the merged object. 4 3 4 - + @@ -466,7 +468,7 @@ primary data for the merged object. 2 4 5 - + @@ -483,7 +485,7 @@ primary data for the merged object. 4 4 5 - + diff --git a/src/gui/glade/mergenote.glade b/src/gui/glade/mergenote.glade index 691271644..b64912a44 100644 --- a/src/gui/glade/mergenote.glade +++ b/src/gui/glade/mergenote.glade @@ -120,6 +120,7 @@ primary data for the merged note. True + 300 True False True @@ -144,6 +145,7 @@ primary data for the merged note. handle_btn1 + 300 True False True @@ -190,7 +192,7 @@ primary data for the merged note. GTK_FILL - + @@ -204,7 +206,7 @@ primary data for the merged note. 2 3 GTK_FILL - + @@ -223,7 +225,7 @@ primary data for the merged note. 1 2 GTK_FILL - + @@ -245,7 +247,7 @@ primary data for the merged note. 1 2 GTK_FILL - + @@ -264,7 +266,7 @@ primary data for the merged note. 2 3 GTK_FILL - + @@ -286,7 +288,7 @@ primary data for the merged note. 2 3 GTK_FILL - + @@ -305,7 +307,7 @@ primary data for the merged note. 3 4 GTK_FILL - + @@ -327,7 +329,7 @@ primary data for the merged note. 3 4 GTK_FILL - + @@ -346,7 +348,7 @@ primary data for the merged note. 4 5 GTK_FILL - + @@ -368,7 +370,7 @@ primary data for the merged note. 4 5 GTK_FILL - + @@ -389,7 +391,7 @@ primary data for the merged note. 2 1 2 - + @@ -410,7 +412,7 @@ primary data for the merged note. 4 1 2 - + @@ -424,7 +426,7 @@ primary data for the merged note. 2 2 3 - + @@ -438,7 +440,7 @@ primary data for the merged note. 4 2 3 - + @@ -452,7 +454,7 @@ primary data for the merged note. 2 3 4 - + @@ -466,7 +468,7 @@ primary data for the merged note. 4 3 4 - + @@ -480,7 +482,7 @@ primary data for the merged note. 2 4 5 - + @@ -497,7 +499,7 @@ primary data for the merged note. 4 4 5 - + diff --git a/src/gui/glade/mergeplace.glade b/src/gui/glade/mergeplace.glade index 765ce583a..9029e49a1 100644 --- a/src/gui/glade/mergeplace.glade +++ b/src/gui/glade/mergeplace.glade @@ -120,6 +120,7 @@ primary data for the merged place. True + 300 True False True @@ -144,6 +145,7 @@ primary data for the merged place. handle_btn1 + 300 True False True @@ -190,7 +192,7 @@ primary data for the merged place. GTK_FILL - + @@ -204,7 +206,7 @@ primary data for the merged place. 2 3 GTK_FILL - + @@ -223,7 +225,7 @@ primary data for the merged place. 1 2 GTK_FILL - + @@ -245,7 +247,7 @@ primary data for the merged place. 1 2 GTK_FILL - + @@ -264,7 +266,7 @@ primary data for the merged place. 2 3 GTK_FILL - + @@ -286,7 +288,7 @@ primary data for the merged place. 2 3 GTK_FILL - + @@ -305,7 +307,7 @@ primary data for the merged place. 3 4 GTK_FILL - + @@ -327,7 +329,7 @@ primary data for the merged place. 3 4 GTK_FILL - + @@ -346,7 +348,7 @@ primary data for the merged place. 4 5 GTK_FILL - + @@ -368,7 +370,7 @@ primary data for the merged place. 4 5 GTK_FILL - + @@ -387,7 +389,7 @@ primary data for the merged place. 5 6 GTK_FILL - + @@ -409,7 +411,7 @@ primary data for the merged place. 5 6 GTK_FILL - + @@ -423,7 +425,7 @@ primary data for the merged place. 2 1 2 - + @@ -437,7 +439,7 @@ primary data for the merged place. 4 1 2 - + @@ -451,7 +453,7 @@ primary data for the merged place. 2 2 3 - + @@ -465,7 +467,7 @@ primary data for the merged place. 4 2 3 - + @@ -479,7 +481,7 @@ primary data for the merged place. 2 3 4 - + @@ -493,7 +495,7 @@ primary data for the merged place. 4 3 4 - + @@ -513,7 +515,7 @@ primary data for the merged place. 2 4 5 - + @@ -533,7 +535,7 @@ primary data for the merged place. 4 4 5 - + @@ -547,7 +549,7 @@ primary data for the merged place. 2 5 6 - + @@ -564,7 +566,7 @@ primary data for the merged place. 4 5 6 - + diff --git a/src/gui/glade/mergerepository.glade b/src/gui/glade/mergerepository.glade index b94a2c70e..bfda575e1 100644 --- a/src/gui/glade/mergerepository.glade +++ b/src/gui/glade/mergerepository.glade @@ -120,6 +120,7 @@ primary data for the merged repository. True + 300 True False True @@ -144,6 +145,7 @@ primary data for the merged repository. handle_btn1 + 300 True False True @@ -190,7 +192,7 @@ primary data for the merged repository. GTK_FILL - + @@ -204,7 +206,7 @@ primary data for the merged repository. 2 3 GTK_FILL - + @@ -223,7 +225,7 @@ primary data for the merged repository. 1 2 GTK_FILL - + @@ -245,7 +247,7 @@ primary data for the merged repository. 1 2 GTK_FILL - + @@ -264,7 +266,7 @@ primary data for the merged repository. 2 3 GTK_FILL - + @@ -286,7 +288,7 @@ primary data for the merged repository. 2 3 GTK_FILL - + @@ -305,7 +307,7 @@ primary data for the merged repository. 3 4 GTK_FILL - + @@ -327,7 +329,7 @@ primary data for the merged repository. 3 4 GTK_FILL - + @@ -341,7 +343,7 @@ primary data for the merged repository. 2 1 2 - + @@ -355,7 +357,7 @@ primary data for the merged repository. 4 1 2 - + @@ -369,7 +371,7 @@ primary data for the merged repository. 2 2 3 - + @@ -383,7 +385,7 @@ primary data for the merged repository. 4 2 3 - + @@ -397,7 +399,7 @@ primary data for the merged repository. 2 3 4 - + @@ -414,7 +416,7 @@ primary data for the merged repository. 4 3 4 - + diff --git a/src/gui/glade/mergesource.glade b/src/gui/glade/mergesource.glade index 73c53ab13..80a282b15 100644 --- a/src/gui/glade/mergesource.glade +++ b/src/gui/glade/mergesource.glade @@ -120,6 +120,7 @@ primary data for the merged source. True + 300 True False True @@ -144,6 +145,7 @@ primary data for the merged source. handle_btn1 + 300 True False True @@ -190,7 +192,7 @@ primary data for the merged source. GTK_FILL - + @@ -204,7 +206,7 @@ primary data for the merged source. 2 3 GTK_FILL - + @@ -223,7 +225,7 @@ primary data for the merged source. 1 2 GTK_FILL - + @@ -245,7 +247,7 @@ primary data for the merged source. 1 2 GTK_FILL - + @@ -264,7 +266,7 @@ primary data for the merged source. 2 3 GTK_FILL - + @@ -286,7 +288,7 @@ primary data for the merged source. 2 3 GTK_FILL - + @@ -305,7 +307,7 @@ primary data for the merged source. 3 4 GTK_FILL - + @@ -327,7 +329,7 @@ primary data for the merged source. 3 4 GTK_FILL - + @@ -346,7 +348,7 @@ primary data for the merged source. 4 5 GTK_FILL - + @@ -368,7 +370,7 @@ primary data for the merged source. 4 5 GTK_FILL - + @@ -387,7 +389,7 @@ primary data for the merged source. 5 6 GTK_FILL - + @@ -409,7 +411,7 @@ primary data for the merged source. 5 6 GTK_FILL - + @@ -423,7 +425,7 @@ primary data for the merged source. 2 1 2 - + @@ -437,7 +439,7 @@ primary data for the merged source. 4 1 2 - + @@ -451,7 +453,7 @@ primary data for the merged source. 2 2 3 - + @@ -465,7 +467,7 @@ primary data for the merged source. 4 2 3 - + @@ -479,7 +481,7 @@ primary data for the merged source. 2 3 4 - + @@ -493,7 +495,7 @@ primary data for the merged source. 4 3 4 - + @@ -507,7 +509,7 @@ primary data for the merged source. 2 4 5 - + @@ -521,7 +523,7 @@ primary data for the merged source. 4 4 5 - + @@ -535,7 +537,7 @@ primary data for the merged source. 2 5 6 - + @@ -552,7 +554,7 @@ primary data for the merged source. 4 5 6 - +