Commit Graph

43 Commits

Author SHA1 Message Date
Christian Persch
b6464b6c0a Add target version handling to gtk-builder-convert
When converting to gtk3, replace GtkComboBoxEntry with GtkComboxBox
has-entry=True, and remove the has-separator property from GtkDialogs.

Bug #639327.
2011-01-12 22:45:57 +01:00
Matthias Clasen
a975d62071 Rename gtk-update-icon-cache and gtk-builder-convert back
In bug 635207, it was pointed out that it is a bad idea to
rename these tools purely in the name of parallel-installability,
since it forces dependencies to make a choice between running
gtk-update-icon-cache and gtk-update-icon-cache-3.0 (or both ?!).

So, we rename these utilities back to their un-suffixed names
and rely on distributors to resolve the conflict between GTK+ 2.x
and GTK+ 3.0 packages, which can be done e.g. by dropping the
utilities from the gtk3 packages and add a gtk3 -> gtk2 dependency.
2011-01-03 21:35:23 -05:00
Matthias Clasen
7447ef0fc2 Make 3.0 parallel-installable to 2.x
In particular, rename

  - libraries to lib*-3.0.so
  - pc files to *-3.0.pc
  - include paths to /usr/include/gtk-3.0/*
  - module paths to /usr/lib/gtk-3.0/*
  - rc files names to gtk-3.0/gtkrc
  - commandline utilities to *-3.0
  - adjust documentation

Also change the install location for unix-print headers to
/usr/include/gtk-3.0/unix-print/gtk.
2010-05-08 01:18:53 -04:00
Matthias Clasen
7f6a534d0f Handle translated combobox models better
Make gtk-builder-convert keep translated combobox models translated.
Fixes bug 553385.
2009-05-03 22:50:27 -04:00
MOROHOSHI Akihiko
d8da8dd4ff Improve dialog handling in gtk-builder-convert
Make gtk-builder-convert handle response ids in GtkFileChooserDialog
correctly. (#557629)
2009-04-11 01:34:22 -04:00
Matthias Clasen
954552a4cf Fix --help output of gtk-builder-convert 2009-04-07 23:38:07 -04:00
Johan Dahlin
fbe7ba55ce Convert GtkComboBox items propertly
If the last character is a newline, just ignore it.
This is what glade normally writes, fixes #578276.
2009-04-07 18:04:05 -03:00
Matthias Clasen
209af946f3 Improve gtk-builder-convert error reporting
Make gtk-builder-convert warn when it meets duplicate ids, since
those will not work with GtkBuilder.
2009-04-06 20:21:04 -04:00
Johan Dahlin
def5d1c47f Bug 559947 – Unchecked dependency on python>=2.4
2008-11-25  Johan Dahlin  <jdahlin@async.com.br>

    Bug 559947 – Unchecked dependency on python>=2.4

    * gtk/gtk-builder-convert:
    Avoid using sorted() which is only present in python 2.


svn path=/trunk/; revision=21807
2008-11-25 13:09:43 +00:00
Johan Dahlin
5fcfc7a368 Bug 553385 – gtk-builder-convert creates untranslated combobox models
2008-09-24  Johan Dahlin  <johan@gnome.org>

    Bug 553385 – gtk-builder-convert creates untranslated combobox models

    * gtk/gtk-builder-convert: Set the translatable property on
    col tags for converted combos.


svn path=/trunk/; revision=21512
2008-09-24 09:59:05 +00:00
Johan Dahlin
aad8c0f16e Remove the requres-version tag as well
2008-08-19  Johan Dahlin  <johan@gnome.org>

    * gtk/gtk-builder-convert (GtkBuilderConverter._parse): 
    Remove the requres-version tag as well


svn path=/trunk/; revision=21157
2008-08-19 10:02:12 +00:00
Johan Dahlin
a5bc18ab7a Bug 548196 – gtk-builder-convert doesn't properly convert GtkTextView
2008-08-18  Johan Dahlin  <johan@gnome.org>

    Bug 548196 – gtk-builder-convert doesn't properly convert GtkTextView

    * gtk/gtk-builder-convert: Rename the text property to buffer.


svn path=/trunk/; revision=21147
2008-08-18 06:51:40 +00:00
Johan Dahlin
f571e582a8 Properly convert GtkImageMenuItems which use stock labels but don't have
2008-03-23  Johan Dahlin  <johan@gnome.org>

	* gtk/gtk-builder-convert:
	Properly convert GtkImageMenuItems which use stock labels but don't
	have any children.
	(#523932, Brian Pepple)


svn path=/trunk/; revision=19924
2008-03-23 08:17:07 +00:00
Johan Dahlin
1cf6a85aab When converting a stock item based on the label, remove the label
2008-02-17  Johan Dahlin  <johan@gnome.org>

    * gtk/gtk-builder-convert (GtkBuilderConverter._add_action_from_menuitem): 
    When converting a stock item based on the label, remove the label property.
    (bug #515824, Yuri Pimenov)


svn path=/trunk/; revision=19607
2008-02-17 22:28:55 +00:00
Johan Dahlin
4c08143831 Handle the case where there is no child text node. (GtkBuilderConverter):
2008-01-25  Johan Dahlin  <johan@gnome.org>

	* gtk/gtk-builder-convert
	(GtkBuilderConverter._convert_adjustment): Handle the case where
	there is no child text node.
	(GtkBuilderConverter): Allow xml comments in most places.


svn path=/trunk/; revision=19405
2008-01-25 18:23:10 +00:00
Johan Dahlin
3f3425d19c Remove the items even if there are no items set.
2008-01-25  Johan Dahlin  <johan@gnome.org>

	* gtk/gtk-builder-convert
	(GtkBuilderConverter._convert_combobox_items): Remove the items
	even if there are no items set.
	(GtkBuilderConverter._add_action_from_menuitem): Convert toggled
	signals and tooltips for all menu items subclasses and 
	GtkImageMenuItem:label. 
	Makes it possible to fully convert and run Jokosher.glade.


svn path=/trunk/; revision=19404
2008-01-25 18:00:15 +00:00
Johan Dahlin
fddc9b8561 Implement accessible support, fixes #454653.
2008-01-25  Johan Dahlin  <johan@gnome.org>

        * gtk/gtkwidget.c: (gtk_widget_buildable_interface_init),
        (gtk_widget_buildable_get_internal_child), (free_action),
        (free_relation), (gtk_widget_buildable_parser_finished),
        (accessibility_start_element),
        (gtk_widget_buildable_custom_tag_start),
        (gtk_widget_buildable_custom_finished):
        Implement accessible support, fixes #454653.

        * gtk/gtk-builder-convert:
        Add support for migrating old glade files
        
        * tests/buildertest.c: (test_widget), (test_file):
        Add accessible tests and improve the test_file function to display
        toplevels and run dialogs.


svn path=/trunk/; revision=19403
2008-01-25 16:17:38 +00:00
Johan Dahlin
6805e87247 New method (GtkBuilderConverter._create_object): Conditionally take a node
2008-01-18  Johan Dahlin  <johan@gnome.org>

	* gtk/gtk-builder-convert (get_property_node): New method
	(GtkBuilderConverter._create_object): Conditionally take a node as
	a property value, so don't lose translate/context attributes if they
	are set. 
	(GtkBuilderConverter._add_action_from_menuitem): Send in Node as
	property values instead of strings.
	(#509153, Erik van Pienbroek)


svn path=/trunk/; revision=19383
2008-01-18 16:09:26 +00:00
Johan Dahlin
284af5af69 Make sure that --root works for toplevel widgets. (#491847, Phil Lello)
2008-01-06  Johan Dahlin  <johan@gnome.org>

	* gtk/gtk-builder-convert (GtkBuilderConverter._strip_root): 
	Make sure that --root works for toplevel widgets.
	(#491847, Phil Lello)


svn path=/trunk/; revision=19309
2008-01-06 02:18:38 +00:00
Johan Dahlin
05360ff15a Refactor to avoid some duplication. Convert toplevel GtkMenu's top popups
2007-12-20  Johan Dahlin  <johan@gnome.org>

	* gtk/gtk-builder-convert (GtkBuilderConverter._remove_window): 
	Refactor to avoid some duplication.
	Convert toplevel GtkMenu's top popups and not menubars in the ui manager.
	Fixes #504749, Yuri Pimenov


svn path=/trunk/; revision=19213
2007-12-20 23:44:18 +00:00
Johan Dahlin
de5463131e Give up instead of raising an error if we can't find the parent dialog
2007-10-24  Johan Dahlin  <jdahlin@async.com.br>

	* gtk/gtk-builder-convert 
	(GtkBuilderConverter._convert_dialog_response): 
	Give up instead of raising an error if we can't find
	the parent dialog when converting response ids.
	(#479463, Priyank)


svn path=/trunk/; revision=18945
2007-10-24 11:52:56 +00:00
Johan Dahlin
48a704da48 signal_name instead of signal. (#486360, Xavier Claessens)
2007-10-13  Johan Dahlin  <jdahlin@async.com.br>

	* gtk/gtk-builder-convert 
	(GtkBuilderConverter._add_action_from_menuitem): signal_name instead
	of signal. (#486360, Xavier Claessens)


svn path=/trunk/; revision=18907
2007-10-13 18:07:32 +00:00
Johan Dahlin
c99040a4b3 Do not iterate recursively over all child nodes.
2007-09-04  Johan Dahlin  <jdahlin@async.com.br>

    * gtk/gtk-builder-convert (GtkBuilder._packing_prop_to_child_attr):
    Do not iterate recursively over all child nodes.
    (GtkBuilderConverter._default_widget_converter): Use a more efficient
    way of iterating over all property nodes
    #472974 (Carlos Garnacho)


svn path=/trunk/; revision=18721
2007-09-04 12:19:37 +00:00
Johan Dahlin
0df0fe47d6 Do not remove empty properties, since we do not know the default
2007-09-04  Johan Dahlin  <jdahlin@async.com.br>

    * gtk/gtk-builder-convert (GtkBuilderConverter._parse): Do not remove 
    empty properties, since we do not know the default GParamSpec values.
    #472981 (Carlos Garnacho)


svn path=/trunk/; revision=18719
2007-09-04 11:53:18 +00:00
Matthias Clasen
822f2614e1 Fix a typo
svn path=/trunk/; revision=18428
2007-07-10 05:00:24 +00:00
Johan Dahlin
83b5d32aef |___* demos/gtk-demo/demo.ui: |___* gtk/gtk-builder-convert: |___*
2007-07-09  Johan Dahlin,,,  <jdahlin@lozenge>

|___* demos/gtk-demo/demo.ui:
|___* gtk/gtk-builder-convert:
|___* gtk/gtkactiongroup.c: (gtk_action_group_buildable_init),
|___(gtk_action_group_buildable_add_child),
|___(accelerator_start_element),
|___(gtk_action_group_buildable_custom_tag_start),
|___(gtk_action_group_buildable_custom_tag_end):
|___* gtk/gtkuimanager.c: (child_hierarchy_changed_cb),
|___(gtk_ui_manager_buildable_construct_child):
|___* tests/buildertest.c: (test_uimanager_simple):

|___Add actiongroup/action accelerator support for builder. #454654


svn path=/trunk/; revision=18408
2007-07-09 13:40:10 +00:00
Johan Dahlin
36fda88e84 Improve the way properties are copied over from a menuitem to an action.
2007-07-08  Johan Dahlin  <jdahlin@async.com.br>

    * gtk/gtk-builder-convert: Improve the way properties
    are copied over from a menuitem to an action.


svn path=/trunk/; revision=18404
2007-07-08 14:33:20 +00:00
Johan Dahlin
a318353ac3 Convert GtkMenus which are not part of a GtkMenuBar. Also move over
2007-07-08  Johan Dahlin  <jdahlin@async.com.br>

    * gtk/gtk-builder-convert (GtkBuilderConverter._convert_menuitem): Convert
    GtkMenus which are not part of a GtkMenuBar. Also move over activate signals
    when converting a GtkMenuItem subclass to an action. 
    (#454830, Bastien Nocera)


svn path=/trunk/; revision=18403
2007-07-08 14:00:21 +00:00
Johan Dahlin
0aeff7f47b Parse <accessibility> but don't do anything yet. Do not strip
2007-07-08  Johan Dahlin  <jdahlin@async.com.br>

    * gtk/gtkwidget.c (gtk_widget_buildable_custom_tag_start): 
    Parse <accessibility> but don't do anything yet.
    * gtk/gtk-builder-convert (GtkBuilderConverter._parse): 
    Do not strip atk/accessibility tags
    * tests/buildertest.c (test_widget): 
    Test this


svn path=/trunk/; revision=18399
2007-07-08 03:22:18 +00:00
Johan Dahlin
98b4985ada (GtkBuilderConverter._add_action_from_menuitem): Only set stock_id
on the action if the menuitem had a stock or label property set


svn path=/trunk/; revision=18395
2007-07-07 16:18:38 +00:00
Johan Dahlin
ac6ba4de7b (GtkBuilderConverter._convert_menuitem): Add support for CheckMenuItems
and do not set name and action on separators


svn path=/trunk/; revision=18394
2007-07-07 16:14:30 +00:00
Johan Dahlin
1acfcddb68 Assert that the tagname of the nodes are correct, factor out a method to a function which doesn't use the instance state.
svn path=/trunk/; revision=18393
2007-07-07 15:59:53 +00:00
Johan Dahlin
c83ba1d9c6 (GtkBuilderConverter._parse): Remove unsupported atkrelation and atkproperty
tags


svn path=/trunk/; revision=18392
2007-07-07 15:50:09 +00:00
Johan Dahlin
39ee9d31ee (GtkBuilderConverter): Refactor; Optimize widget lookups by not
traversing the whole tree.
    Use a common api to create sizegroups, actiongroups and uimanagers
    to avoid name conflicts.
    Output newly created objects sorted by id before the old roots under
    <interface>


svn path=/trunk/; revision=18391
2007-07-07 15:44:30 +00:00
Johan Dahlin
6257f681d2 Convert GtkTextView::text properties
2007-07-07  Johan Dahlin  <jdahlin@async.com.br>

    * gtk/gtk-builder-convert (GtkBuilderConverter._convert_textview_text): 
    Convert GtkTextView::text properties


svn path=/trunk/; revision=18389
2007-07-07 15:11:52 +00:00
Johan Dahlin
d606fb052a Add support for converting GtkComboBox items, also make sure that we
2007-07-04  Johan Dahlin  <jdahlin@async.com.br>

    * gtk/gtk-builder-convert:
    Add support for converting GtkComboBox items, also make sure
    that we support more than one GtkAdjustment in a file


svn path=/trunk/; revision=18371
2007-07-04 03:44:38 +00:00
Johan Dahlin
0b3728b3cd Add a --root option. Filter empty properties. Convert GtkAdjustments.
2007-07-03  Johan Dahlin  <jdahlin@async.com.br>

    * gtk/gtk-builder-convert (GtkBuilderConverter._strip_root): Add a
    --root option. Filter empty properties. Convert GtkAdjustments.


svn path=/trunk/; revision=18350
2007-07-03 03:28:39 +00:00
Johan Dahlin
0c993121b1 Convert to getopt, improved documentation, change the script to require
2007-07-01  Johan Dahlin  <jdahlin@async.com.br>

    * gtk/gtk-builder-convert (GtkBuilderConverter): 
    Convert to getopt, improved documentation, change
    the script to require two arguments


svn path=/trunk/; revision=18325
2007-07-01 15:58:24 +00:00
Johan Dahlin
118f2e6483 Prettify the output by running it through xmllint --format if xmllint is
2007-06-28  Johan Dahlin  <jdahlin@async.com.br>

    * gtk/gtk-builder-convert (_indent): Prettify the output by
    running it through xmllint --format if xmllint is available 
    which also requires the subprocess module only available 
    in python 2.4 or later


svn path=/trunk/; revision=18281
2007-06-28 15:15:02 +00:00
Johan Dahlin
3825c65170 (GtkBuilderConverter._convert):
Make sure that we can convert Gazpacho files too.


svn path=/trunk/; revision=18269
2007-06-27 23:44:25 +00:00
Johan Dahlin
1aea7f0956 Remove glade-interface doctype if found.
2007-06-27  Johan Dahlin  <jdahlin@async.com.br>

    * gtk/gtk-builder-convert (GtkBuilderConverter._parse): Remove
    glade-interface doctype if found.


svn path=/trunk/; revision=18265
2007-06-27 23:36:47 +00:00
Johan Dahlin
927c852aa9 Encode the output in utf-8 as suggested by Bogdan Nicula
* gtk/gtk-builder-convert (GtkBuilderConverter.to_xml): Encode 
    the output in utf-8 as suggested by Bogdan Nicula


svn path=/trunk/; revision=18245
2007-06-26 15:21:23 +00:00
Johan Dahlin
11283609e8 Add a script to convert libglade files to something gtkbuilder can parse.
* gtk/gtk-builder-convert: Add a script to convert libglade files
    to something gtkbuilder can parse.
    Fixes #447995


svn path=/trunk/; revision=18232
2007-06-26 02:42:41 +00:00