postprocess/packconfig/packconfig.pl | 4 - sfx2/uiconfig/ui/checkin.ui | 85 +++++++++++++++++++---------------- 2 files changed, 49 insertions(+), 40 deletions(-)
New commits: commit 5cc34dc91211b6173139d1a1a76c494c4a1f9a75 Author: Caolán McNamara <[email protected]> Date: Wed Nov 7 14:39:15 2012 +0000 using a grid instead of a box because I haven't implemented widget prop expands yet in boxes, but I have in grid, not too hard to do, just need to get around to it Change-Id: I6120df6061f622e14f8160f0bb098fcaba15abab diff --git a/sfx2/uiconfig/ui/checkin.ui b/sfx2/uiconfig/ui/checkin.ui index c97657d..0585acb 100644 --- a/sfx2/uiconfig/ui/checkin.ui +++ b/sfx2/uiconfig/ui/checkin.ui @@ -39,6 +39,8 @@ <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="has_default">True</property> <property name="receives_default">True</property> <property name="use_action_appearance">False</property> <property name="use_stock">True</property> @@ -58,61 +60,68 @@ </packing> </child> <child> - <object class="GtkBox" id="box1"> + <object class="GtkGrid" id="grid1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="orientation">vertical</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> <child> - <object class="GtkLabel" id="label1"> + <object class="GtkCheckButton" id="MajorVersion"> + <property name="label" translatable="yes">New major version</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="ypad">8</property> - <property name="label" translatable="yes">Version comment</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_action_appearance">False</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> </object> <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + <property name="width">1</property> + <property name="height">1</property> </packing> </child> <child> - <object class="GtkAlignment" id="alignment1"> + <object class="GtkFrame" id="frame1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> + <property name="label_xalign">0</property> + <property name="shadow_type">none</property> <child> - <object class="GtkTextView" id="VersionComment"> - <property name="width_request">300</property> - <property name="height_request">150</property> + <object class="GtkAlignment" id="alignment2"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="wrap_mode">word</property> + <property name="can_focus">False</property> + <property name="top_padding">6</property> + <property name="left_padding">12</property> + <child> + <object class="GtkTextView" id="VersionComment"> + <property name="width_request">300</property> + <property name="height_request">150</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="wrap_mode">word</property> + </object> + </child> + </object> + </child> + <child type="label"> + <object class="GtkLabel" id="label2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Version comment</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> </object> </child> </object> <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="MajorVersion"> - <property name="label" translatable="yes">New major version</property> - <property name="use_action_appearance">False</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + <property name="width">1</property> + <property name="height">1</property> </packing> </child> </object> commit 2f534d934fb10707146af977f6d1db7a19277645 Author: Caolán McNamara <[email protected]> Date: Wed Nov 7 13:45:42 2012 +0000 fix packconfig help message Change-Id: I71b55505047104c7e7d64ca93fc59429754892d1 diff --git a/postprocess/packconfig/packconfig.pl b/postprocess/packconfig/packconfig.pl index 924dee9..cb8fb89 100644 --- a/postprocess/packconfig/packconfig.pl +++ b/postprocess/packconfig/packconfig.pl @@ -231,8 +231,8 @@ sub replace_file sub usage { - print STDERR "Usage: packimages.pl [-h] -o out_file -i file_path\n"; - print STDERR "Creates archive of images\n"; + print STDERR "Usage: packconfig.pl [-h] -o out_file -i file_path\n"; + print STDERR "Creates archive of userinterface config files\n"; print STDERR "Options:\n"; print STDERR " -h print this help\n"; print STDERR " -o out_file path to output archive\n";
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
