diff options
author | Caolán McNamara <caolanm@redhat.com> | 2016-07-13 12:16:34 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2016-07-13 12:19:49 +0100 |
commit | 380b2d2e449eee1e794efa1b16b69289419a9a66 (patch) | |
tree | d4080146b7f3d38fbc79dd1331e6b1603e577c26 | |
parent | 6431f5554bd585935e7a9bc354609a4363a09509 (diff) |
Resolves: tdf#100340 make compress graphic dialog less wide
'regression' seems harsh, its not so wide it didn't fit on a reasonable sized
screen or look particularly horrific.
Change-Id: I20d55b8aac609ee0d683eb9a1c2b173aa0c9d8da
-rw-r--r-- | include/svx/compressgraphicdialog.hxx | 4 | ||||
-rw-r--r-- | svtools/source/filter/exportdialog.cxx | 4 | ||||
-rw-r--r-- | svtools/uiconfig/ui/graphicexport.ui | 6 | ||||
-rw-r--r-- | svx/source/dialog/compressgraphicdialog.cxx | 32 | ||||
-rw-r--r-- | svx/uiconfig/ui/compressgraphicdialog.ui | 409 |
5 files changed, 251 insertions, 204 deletions
diff --git a/include/svx/compressgraphicdialog.hxx b/include/svx/compressgraphicdialog.hxx index 9b00d24e7f01..08819e9c04d3 100644 --- a/include/svx/compressgraphicdialog.hxx +++ b/include/svx/compressgraphicdialog.hxx @@ -63,6 +63,10 @@ private: void Initialize(); + DECL_LINK_TYPED( EndSlideHdl, Slider*, void ); + DECL_LINK_TYPED( NewInterpolationModifiedHdl, ListBox&, void ); + DECL_LINK_TYPED( NewQualityModifiedHdl, Edit&, void ); + DECL_LINK_TYPED( NewCompressionModifiedHdl, Edit&, void ); DECL_LINK_TYPED( NewWidthModifiedHdl, Edit&, void ); DECL_LINK_TYPED( NewHeightModifiedHdl, Edit&, void ); DECL_LINK_TYPED( ResolutionModifiedHdl, Edit&, void ); diff --git a/svtools/source/filter/exportdialog.cxx b/svtools/source/filter/exportdialog.cxx index 2e927d8d8291..12c705af4481 100644 --- a/svtools/source/filter/exportdialog.cxx +++ b/svtools/source/filter/exportdialog.cxx @@ -716,7 +716,7 @@ void ExportDialog::createFilterOptions() if ((nQuality < 1 ) || (nQuality > 100)) nQuality = 75; get(mpSbCompression, "compressionjpgsb"); - get(mpNfCompression, "compressionjpgnf-nospin"); + get(mpNfCompression, "compressionjpgnf"); mpSbCompression->SetRangeMin( 1 ); mpSbCompression->SetRangeMax( 100 ); mpNfCompression->SetMin( 1 ); @@ -734,7 +734,7 @@ void ExportDialog::createFilterOptions() nCompression = 6; get(mpSbCompression, "compressionpngsb"); - get(mpNfCompression, "compressionpngnf-nospin"); + get(mpNfCompression, "compressionpngnf"); mpSbCompression->SetRangeMin( 1 ); mpSbCompression->SetRangeMax( 9 ); mpNfCompression->SetMin( 1 ); diff --git a/svtools/uiconfig/ui/graphicexport.ui b/svtools/uiconfig/ui/graphicexport.ui index 5f8c45954718..9dba2f2709a1 100644 --- a/svtools/uiconfig/ui/graphicexport.ui +++ b/svtools/uiconfig/ui/graphicexport.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.18.3 --> +<!-- Generated with glade 3.20.0 --> <interface> <requires lib="gtk+" version="3.0"/> <object class="GtkAdjustment" id="adjustment1"> @@ -334,7 +334,7 @@ <property name="can_focus">False</property> <property name="column_spacing">6</property> <child> - <object class="GtkSpinButton" id="compressionjpgnf-nospin"> + <object class="GtkSpinButton" id="compressionjpgnf"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="invisible_char">●</property> @@ -397,7 +397,7 @@ <property name="can_focus">False</property> <property name="column_spacing">6</property> <child> - <object class="GtkSpinButton" id="compressionpngnf-nospin"> + <object class="GtkSpinButton" id="compressionpngnf"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="invisible_char">●</property> diff --git a/svx/source/dialog/compressgraphicdialog.cxx b/svx/source/dialog/compressgraphicdialog.cxx index 7dedc172fc18..9dcc2c561b23 100644 --- a/svx/source/dialog/compressgraphicdialog.cxx +++ b/svx/source/dialog/compressgraphicdialog.cxx @@ -112,6 +112,8 @@ void CompressGraphicsDialog::Initialize() m_pInterpolationCombo->SelectEntry( "Lanczos" ); + m_pInterpolationCombo->SetSelectHdl( LINK( this, CompressGraphicsDialog, NewInterpolationModifiedHdl )); + m_pMFNewWidth->SetModifyHdl( LINK( this, CompressGraphicsDialog, NewWidthModifiedHdl )); m_pMFNewHeight->SetModifyHdl( LINK( this, CompressGraphicsDialog, NewHeightModifiedHdl )); @@ -124,7 +126,11 @@ void CompressGraphicsDialog::Initialize() m_pReduceResolutionCB->SetToggleHdl( LINK( this, CompressGraphicsDialog, ToggleReduceResolutionRB ) ); m_pQualitySlider->SetLinkedField(m_pQualityMF); + m_pQualitySlider->SetEndSlideHdl( LINK( this, CompressGraphicsDialog, EndSlideHdl )); m_pCompressionSlider->SetLinkedField(m_pCompressionMF); + m_pCompressionSlider->SetEndSlideHdl( LINK( this, CompressGraphicsDialog, EndSlideHdl )); + m_pQualityMF->SetModifyHdl( LINK( this, CompressGraphicsDialog, NewQualityModifiedHdl )); + m_pCompressionMF->SetModifyHdl( LINK( this, CompressGraphicsDialog, NewCompressionModifiedHdl )); m_pJpegCompRB->Check(); m_pReduceResolutionCB->Check(); @@ -290,6 +296,8 @@ void CompressGraphicsDialog::Compress(SvStream& aStream) IMPL_LINK_NOARG_TYPED( CompressGraphicsDialog, NewWidthModifiedHdl, Edit&, void ) { + fprintf(stderr, "NewWidthModifiedHdl\n"); + m_dResolution = m_pMFNewWidth->GetValue() / GetViewWidthInch(); UpdateNewHeightMF(); @@ -297,6 +305,28 @@ IMPL_LINK_NOARG_TYPED( CompressGraphicsDialog, NewWidthModifiedHdl, Edit&, void Update(); } +IMPL_LINK_NOARG_TYPED( CompressGraphicsDialog, EndSlideHdl, Slider*, void ) +{ + Update(); +} + +IMPL_LINK_NOARG_TYPED( CompressGraphicsDialog, NewInterpolationModifiedHdl, ListBox&, void ) +{ + Update(); +} + +IMPL_LINK_NOARG_TYPED( CompressGraphicsDialog, NewQualityModifiedHdl, Edit&, void ) +{ + m_pQualitySlider->SetThumbPos(m_pQualityMF->GetValue()); + Update(); +} + +IMPL_LINK_NOARG_TYPED( CompressGraphicsDialog, NewCompressionModifiedHdl, Edit&, void ) +{ + m_pCompressionSlider->SetThumbPos(m_pCompressionMF->GetValue()); + Update(); +} + IMPL_LINK_NOARG_TYPED( CompressGraphicsDialog, NewHeightModifiedHdl, Edit&, void ) { m_dResolution = m_pMFNewHeight->GetValue() / GetViewHeightInch(); @@ -322,6 +352,7 @@ IMPL_LINK_NOARG_TYPED( CompressGraphicsDialog, ToggleCompressionRB, RadioButton& m_pCompressionSlider->Enable(choice); m_pQualityMF->Enable(!choice); m_pQualitySlider->Enable(!choice); + Update(); } IMPL_LINK_NOARG_TYPED( CompressGraphicsDialog, ToggleReduceResolutionRB, CheckBox&, void ) @@ -331,6 +362,7 @@ IMPL_LINK_NOARG_TYPED( CompressGraphicsDialog, ToggleReduceResolutionRB, CheckBo m_pMFNewHeight->Enable(choice); m_pResolutionLB->Enable(choice); m_pInterpolationCombo->Enable(choice); + Update(); } IMPL_LINK_NOARG_TYPED( CompressGraphicsDialog, CalculateClickHdl, Button*, void ) diff --git a/svx/uiconfig/ui/compressgraphicdialog.ui b/svx/uiconfig/ui/compressgraphicdialog.ui index 2c812eb6a2df..da94ccb049f2 100644 --- a/svx/uiconfig/ui/compressgraphicdialog.ui +++ b/svx/uiconfig/ui/compressgraphicdialog.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.18.3 --> +<!-- Generated with glade 3.20.0 --> <interface> <requires lib="gtk+" version="3.0"/> <object class="GtkAdjustment" id="compression-adjustment"> @@ -119,15 +119,16 @@ </packing> </child> <child> - <object class="GtkBox" id="box1"> + <object class="GtkGrid"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="spacing">12</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> <child> <object class="GtkFrame" id="frame2"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="valign">start</property> <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> @@ -142,75 +143,183 @@ <property name="can_focus">False</property> <property name="hexpand">True</property> <property name="row_spacing">6</property> - <property name="column_spacing">12</property> + <property name="column_spacing">6</property> <child> - <object class="GtkRadioButton" id="radio-lossless"> - <property name="label" translatable="yes">Lossless compression</property> + <object class="GtkRadioButton" id="radio-jpeg"> + <property name="label" translatable="yes">JPEG Compression</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="xalign">0</property> - <property name="active">True</property> <property name="draw_indicator">True</property> + <property name="group">radio-lossless</property> </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">3</property> - <property name="width">3</property> + <property name="top_attach">0</property> </packing> </child> <child> - <object class="GtkCheckButton" id="checkbox-reduce-resolution"> - <property name="label" translatable="yes">Reduce image resolution</property> + <object class="GtkRadioButton" id="radio-lossless"> + <property name="label" translatable="yes">PNG Quality</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="xalign">0</property> + <property name="active">True</property> <property name="draw_indicator">True</property> </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">6</property> - <property name="width">3</property> + <property name="top_attach">2</property> </packing> </child> <child> - <object class="GtkSpinButton" id="spin-new-width"> + <object class="GtkAlignment"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="adjustment">width-adjustment</property> - <property name="numeric">True</property> + <property name="left_padding">12</property> + <child> + <object class="GtkGrid"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="column_spacing">6</property> + <child> + <object class="GtkScale" id="scale-quality"> + <property name="width_request">200</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="adjustment">quality-adjustment</property> + <property name="fill_level">99</property> + <property name="digits">0</property> + <property name="draw_value">False</property> + <property name="value_pos">right</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="spin-quality"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="invisible_char">•</property> + <property name="text" translatable="yes">90</property> + <property name="adjustment">quality-adjustment</property> + <property name="numeric">True</property> + <property name="value">90</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + </object> + </child> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">7</property> + <property name="left_attach">0</property> + <property name="top_attach">1</property> </packing> </child> <child> - <object class="GtkLabel" id="label4"> + <object class="GtkAlignment"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_left">12</property> - <property name="label" translatable="yes">Height:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">spin-new-height</property> - <property name="width_chars">14</property> - <property name="xalign">1</property> + <property name="left_padding">12</property> + <child> + <object class="GtkGrid"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="column_spacing">6</property> + <child> + <object class="GtkScale" id="scale-compression"> + <property name="width_request">200</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="adjustment">compression-adjustment</property> + <property name="fill_level">9</property> + <property name="digits">0</property> + <property name="draw_value">False</property> + <property name="value_pos">right</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="spin-compression"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="invisible_char">•</property> + <property name="text" translatable="yes">9</property> + <property name="adjustment">compression-adjustment</property> + <property name="numeric">True</property> + <property name="value">9</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + </object> + </child> </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">8</property> + <property name="top_attach">3</property> </packing> </child> + </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">Compression Options</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkFrame" id="frame3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label_xalign">0</property> + <property name="shadow_type">none</property> + <child> + <object class="GtkAlignment" id="alignment3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="top_padding">6</property> + <property name="left_padding">12</property> + <child> + <object class="GtkGrid"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">start</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> <child> - <object class="GtkRadioButton" id="radio-jpeg"> - <property name="label" translatable="yes">JPEG compression</property> + <object class="GtkCheckButton" id="checkbox-reduce-resolution"> + <property name="label" translatable="yes">Reduce image resolution</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> - <property name="group">radio-lossless</property> </object> <packing> <property name="left_attach">0</property> @@ -219,94 +328,54 @@ </packing> </child> <child> - <object class="GtkLabel" id="label5"> + <object class="GtkLabel" id="label3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_left">12</property> - <property name="label" translatable="yes">Resolution:</property> + <property name="label" translatable="yes">Width:</property> <property name="use_underline">True</property> - <property name="mnemonic_widget">combo-resolution</property> + <property name="mnemonic_widget">spin-new-width</property> <property name="width_chars">14</property> <property name="xalign">1</property> </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">9</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="spin-new-height"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="adjustment">height-adjustment</property> - <property name="numeric">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">8</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="combo-resolution"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="has_entry">True</property> - <items> - <item>50</item> - <item>75</item> - <item>96</item> - <item>150</item> - <item>200</item> - <item>300</item> - <item>600</item> - </items> - <child internal-child="entry"> - <object class="GtkEntry" id="comboboxtext-entry"> - <property name="can_focus">False</property> - <property name="invisible_char">•</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">9</property> + <property name="top_attach">1</property> </packing> </child> <child> - <object class="GtkLabel" id="label6"> + <object class="GtkLabel" id="label4"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_left">12</property> - <property name="label" translatable="yes">Quality:</property> + <property name="label" translatable="yes">Height:</property> <property name="use_underline">True</property> + <property name="mnemonic_widget">spin-new-height</property> <property name="width_chars">14</property> <property name="xalign">1</property> </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">1</property> + <property name="top_attach">2</property> </packing> </child> <child> - <object class="GtkLabel" id="label11"> + <object class="GtkLabel" id="label5"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_left">12</property> - <property name="label" translatable="yes">Compression:</property> + <property name="label" translatable="yes">Resolution:</property> <property name="use_underline">True</property> + <property name="mnemonic_widget">combo-resolution</property> <property name="width_chars">14</property> <property name="xalign">1</property> </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">4</property> + <property name="top_attach">3</property> </packing> </child> <child> <object class="GtkLabel" id="label12"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_left">12</property> <property name="label" translatable="yes">Interpolation:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">interpolation-method-combo</property> @@ -315,40 +384,17 @@ </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">10</property> - </packing> - </child> - <child> - <object class="GtkComboBox" id="interpolation-method-combo"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="model">interpolation-method-store</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">10</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="spin-compression"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="invisible_char">•</property> - <property name="adjustment">compression-adjustment</property> - <property name="numeric">True</property> - </object> - <packing> - <property name="left_attach">1</property> <property name="top_attach">4</property> </packing> </child> <child> - <object class="GtkSpinButton" id="spin-quality"> + <object class="GtkSpinButton" id="spin-new-width"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="invisible_char">•</property> - <property name="adjustment">quality-adjustment</property> + <property name="text" translatable="yes">1</property> + <property name="adjustment">width-adjustment</property> <property name="numeric">True</property> + <property name="value">1</property> </object> <packing> <property name="left_attach">1</property> @@ -356,17 +402,13 @@ </packing> </child> <child> - <object class="GtkScale" id="scale-quality"> - <property name="width_request">100</property> + <object class="GtkSpinButton" id="spin-new-height"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="adjustment">quality-adjustment</property> - <property name="fill_level">99</property> - <property name="round_digits">0</property> - <property name="digits">0</property> - <property name="draw_value">False</property> - <property name="value_pos">right</property> + <property name="text" translatable="yes">1</property> + <property name="adjustment">height-adjustment</property> + <property name="numeric">True</property> + <property name="value">1</property> </object> <packing> <property name="left_attach">1</property> @@ -374,36 +416,43 @@ </packing> </child> <child> - <object class="GtkScale" id="scale-compression"> - <property name="width_request">200</property> + <object class="GtkComboBoxText" id="combo-resolution"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="adjustment">compression-adjustment</property> - <property name="fill_level">9</property> - <property name="round_digits">0</property> - <property name="digits">0</property> - <property name="draw_value">False</property> - <property name="value_pos">right</property> + <property name="can_focus">False</property> + <property name="has_entry">True</property> + <items> + <item>50</item> + <item>75</item> + <item>96</item> + <item>150</item> + <item>200</item> + <item>300</item> + <item>600</item> + </items> + <child internal-child="entry"> + <object class="GtkEntry"> + <property name="can_focus">True</property> + </object> + </child> </object> <packing> <property name="left_attach">1</property> - <property name="top_attach">5</property> + <property name="top_attach">3</property> </packing> </child> <child> - <object class="GtkLabel" id="label16"> + <object class="GtkComboBox" id="interpolation-method-combo"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">DPI</property> - <property name="xalign">0</property> + <property name="model">interpolation-method-store</property> </object> <packing> - <property name="left_attach">2</property> - <property name="top_attach">9</property> + <property name="left_attach">1</property> + <property name="top_attach">4</property> </packing> </child> <child> - <object class="GtkLabel" id="label14"> + <object class="GtkLabel" id="label13"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">px</property> @@ -411,11 +460,11 @@ </object> <packing> <property name="left_attach">2</property> - <property name="top_attach">8</property> + <property name="top_attach">1</property> </packing> </child> <child> - <object class="GtkLabel" id="label13"> + <object class="GtkLabel" id="label14"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">px</property> @@ -423,55 +472,33 @@ </object> <packing> <property name="left_attach">2</property> - <property name="top_attach">7</property> + <property name="top_attach">2</property> </packing> </child> <child> - <object class="GtkLabel" id="label3"> + <object class="GtkLabel" id="label16"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_left">12</property> - <property name="label" translatable="yes">Width:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">spin-new-width</property> - <property name="width_chars">14</property> - <property name="xalign">1</property> + <property name="label" translatable="yes">DPI</property> + <property name="xalign">0</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">7</property> + <property name="left_attach">2</property> + <property name="top_attach">3</property> </packing> </child> <child> <placeholder/> </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> </object> </child> </object> </child> <child type="label"> - <object class="GtkLabel" id="label2"> + <object class="GtkLabel" id="label22"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Compression Options</property> + <property name="label" translatable="yes">Resolution</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -479,9 +506,8 @@ </child> </object> <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">0</property> + <property name="left_attach">1</property> + <property name="top_attach">0</property> </packing> </child> <child> @@ -554,18 +580,6 @@ </packing> </child> <child> - <object class="GtkLabel" id="label10"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">New size:</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">4</property> - </packing> - </child> - <child> <object class="GtkLabel" id="label-view-size"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -605,19 +619,6 @@ </packing> </child> <child> - <object class="GtkButton" id="calculate"> - <property name="label" translatable="yes">Calculate</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="halign">start</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">5</property> - </packing> - </child> - <child> <object class="GtkLabel" id="label15"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -644,7 +645,17 @@ </packing> </child> <child> - <placeholder/> + <object class="GtkButton" id="calculate"> + <property name="label" translatable="yes">Calculate New Size:</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="halign">start</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">4</property> + </packing> </child> </object> </child> @@ -662,14 +673,14 @@ </child> </object> <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + <property name="width">2</property> </packing> </child> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="fill">True</property> <property name="position">1</property> </packing> |