sw/Module_sw.mk | 1 sw/UIConfig_qa.mk | 16 + sw/qa/tiledrendering/tiledrendering.cxx | 18 +- sw/qa/tiledrendering/tiledrendering.ui | 273 ++++++++++++++++++++++++++++++++ 4 files changed, 300 insertions(+), 8 deletions(-)
New commits: commit b9eaa646815bf9b400ecc0d5726de5241428cf34 Author: Jan Holesovsky <ke...@collabora.com> Date: Tue Oct 22 13:36:59 2013 +0200 Tiled rendering: Finishing touch to the tiledrendering.ui. Change-Id: I1fb7c2cfdf8ffd69f8a2b4e1aba195939424606b diff --git a/sw/UIConfig_qa.mk b/sw/UIConfig_qa.mk index 7bc46b4..13e19e3 100644 --- a/sw/UIConfig_qa.mk +++ b/sw/UIConfig_qa.mk @@ -7,9 +7,9 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_UIConfig_UIConfig,modules/swriter)) +$(eval $(call gb_UIConfig_UIConfig,qa/sw)) -$(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\ +$(eval $(call gb_UIConfig_add_uifiles,qa/sw,\ sw/qa/tiledrendering/tiledrendering \ )) diff --git a/sw/qa/tiledrendering/tiledrendering.cxx b/sw/qa/tiledrendering/tiledrendering.cxx index d849cec..5ea5f48 100644 --- a/sw/qa/tiledrendering/tiledrendering.cxx +++ b/sw/qa/tiledrendering/tiledrendering.cxx @@ -66,7 +66,7 @@ int UIPreviewApp::Main() try { - Dialog *pDialog = new ModalDialog(DIALOG_NO_PARENT, "TiledRendering", "sw/qa/tiledrendering/tiledrendering.ui"); + Dialog *pDialog = new ModalDialog(DIALOG_NO_PARENT, "TiledRendering", "qa/sw/ui/tiledrendering.ui"); pDialog->Execute(); /* diff --git a/sw/qa/tiledrendering/tiledrendering.ui b/sw/qa/tiledrendering/tiledrendering.ui index 3b727d6..7d051fb 100644 --- a/sw/qa/tiledrendering/tiledrendering.ui +++ b/sw/qa/tiledrendering/tiledrendering.ui @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <interface> <!-- interface-requires gtk+ 3.0 --> - <object class="GtkWindow" id="window1"> + <object class="GtkWindow" id="TiledRendering"> <property name="can_focus">False</property> <child> <object class="GtkBox" id="box1"> commit b3ed2a26e77c89c7b305b12c2ac1b422ef9d9821 Author: Ptyl Dragon <p...@cloudon.com> Date: Tue Oct 22 14:22:58 2013 +0200 added the tiledrendering ui from glade Change-Id: I8c32f5f3e09d2dc6214a76cd15a0b3adba62824e diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk index c53dd15..7401742 100644 --- a/sw/Module_sw.mk +++ b/sw/Module_sw.mk @@ -33,6 +33,7 @@ $(eval $(call gb_Module_add_targets,sw,\ UIConfig_swreport \ UIConfig_swriter \ UIConfig_swxform \ + UIConfig_qa \ )) ifneq ($(DISABLE_SCRIPTING),TRUE) diff --git a/sw/UIConfig_qa.mk b/sw/UIConfig_qa.mk new file mode 100644 index 0000000..7bc46b4 --- /dev/null +++ b/sw/UIConfig_qa.mk @@ -0,0 +1,16 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_UIConfig_UIConfig,modules/swriter)) + +$(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\ + sw/qa/tiledrendering/tiledrendering \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/sw/qa/tiledrendering/tiledrendering.cxx b/sw/qa/tiledrendering/tiledrendering.cxx index 923c79d..d849cec 100644 --- a/sw/qa/tiledrendering/tiledrendering.cxx +++ b/sw/qa/tiledrendering/tiledrendering.cxx @@ -55,21 +55,23 @@ int UIPreviewApp::Main() uifiles.push_back(aFileUrl); } - if (uifiles.empty()) - { - fprintf(stderr, "Usage: ui-previewer file.ui\n"); - return EXIT_FAILURE; - } + //if (uifiles.empty()) + //{ + // fprintf(stderr, "Usage: ui-previewer file.ui\n"); + // return EXIT_FAILURE; + //} // turn on tooltips Help::EnableQuickHelp(); try { - Dialog *pDialog = new Dialog(DIALOG_NO_PARENT, WB_STDDIALOG); + Dialog *pDialog = new ModalDialog(DIALOG_NO_PARENT, "TiledRendering", "sw/qa/tiledrendering/tiledrendering.ui"); + pDialog->Execute(); +/* { - VclBuilder aBuilder(pDialog, OUString(), uifiles[0]); + VclBuilder aBuilder(pDialog, OUString(), "sw/qa/tiledrendering/tiledrendering.ui"); Dialog *pRealDialog = dynamic_cast<Dialog*>(aBuilder.get_widget_root()); if (!pRealDialog) @@ -81,7 +83,7 @@ int UIPreviewApp::Main() pRealDialog->SetStyle(pDialog->GetStyle()|WB_CLOSEABLE); pRealDialog->Execute(); } - } + }*/ delete pDialog; } diff --git a/sw/qa/tiledrendering/tiledrendering.ui b/sw/qa/tiledrendering/tiledrendering.ui new file mode 100644 index 0000000..3b727d6 --- /dev/null +++ b/sw/qa/tiledrendering/tiledrendering.ui @@ -0,0 +1,273 @@ +<?xml version="1.0" encoding="UTF-8"?> +<interface> + <!-- interface-requires gtk+ 3.0 --> + <object class="GtkWindow" id="window1"> + <property name="can_focus">False</property> + <child> + <object class="GtkBox" id="box1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkBox" id="box2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkBox" id="box3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkBox" id="box4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkLabel" id="labelContentWidth"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">contentWidth</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="labelContentHeight"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">contentHeight</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="labelTilePosX"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">tilePosX</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="labelTilePoxY"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">tilePosY</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="labelTileWidth"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">tileWidth</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">4</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="labelTileHeight"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">tileHeight</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">5</property> + </packing> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="box5"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkSpinButton" id="spinContentWidth"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="invisible_char">â¢</property> + <property name="progress_pulse_step">1</property> + <property name="numeric">True</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="spinContentHeight"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="invisible_char">â¢</property> + <property name="progress_pulse_step">1</property> + <property name="numeric">True</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="spinTilePosX"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="invisible_char">â¢</property> + <property name="progress_pulse_step">1</property> + <property name="numeric">True</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="spinTilePosY"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="invisible_char">â¢</property> + <property name="progress_pulse_step">1</property> + <property name="numeric">True</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="spinTileWidth"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="invisible_char">â¢</property> + <property name="progress_pulse_step">1</property> + <property name="numeric">True</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">4</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="spinTileHeight"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="invisible_char">â¢</property> + <property name="width_chars">1</property> + <property name="progress_pulse_step">1</property> + <property name="numeric">True</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">5</property> + </packing> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="box6"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkButton" id="buttonRenderTile"> + <property name="label" translatable="yes">render tile</property> + <property name="use_action_appearance">False</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_action_appearance">False</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack_type">end</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="buttonChooseDocument"> + <property name="label" translatable="yes">choose document</property> + <property name="use_action_appearance">False</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_action_appearance">False</property> + <property name="xalign">0.50999999046325684</property> + <property name="yalign">0.47999998927116394</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkImage" id="image1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="stock">gtk-missing-image</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + </child> + </object> +</interface>
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits