AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity
61,829 Commits 969 Branches 749 Tags 504 MiB
ca1d4322a2
Commit Graph

42 Commits

Author SHA1 Message Date
Matthias Clasen
948ab2767b Merge branch 'master' into 'master' 
builder-tool: rename show-close-button to show-title-buttons

See merge request GNOME/gtk!1497
 2020-03-06 18:02:06 +00:00
Benjamin Otte
317dcddddb builder-tool: Don't allow property to be both resize and shrink 
Otherwise builder-tool crashes when you do

  <property name="shrink" name="resize">1</property>

Thanks to the static analyzer for figuring that one out.
 2020-03-06 05:44:11 +01:00
Matt Guerrette
46ba019522 builder-tool: rename show-close-button to show-title-buttons 
For GtkHeaderBar show-close-button has been renamed to
show-title-buttons for GTK4. This commit adds this fixup to the builder
tool
 2020-03-02 22:24:46 -05:00
Matthias Clasen
fa75d7f480 builder-tool: Fix a thinko 
We can't rely on the pspec for a removed property.
This code worked until I actually removed the properties.

Update the tests to reflect this.
 2020-02-26 10:01:38 -05:00
Matthias Clasen
37a2cae10e Small fixups 
Trying to get the ci style test to pass.
 2020-02-26 08:13:45 -05:00
Matthias Clasen
77ce55b9ac builder-tool: replace some properties 
Replace expand by hexpand and vexpand and
margin by margin-left, -right, -top, -bottom.
 2020-02-25 17:50:57 -05:00
Matthias Clasen
57a861723c buildertool: Drop menu properties 2019-12-29 20:31:58 -05:00
Matthias Clasen
e4fb4116fd builder-tool: Don't try to find default boxed values 
This doesn't work and yields an ugly, unnecessary
error message.
 2019-12-13 14:21:44 -05:00
Matthias Clasen
6d3373cb2c gtk-builder-tool: More helpful error messages 
Include line numbers in the error messages we
report, so it is possible to find the error.
 2019-12-13 14:21:44 -05:00
Matthias Clasen
85950afbbd builder-tool: Fix handling of layout properties 
We were not properly identifying layout properties
that need to be kept, causing GtkGrid left-attachment
to go missing in widget-factory.ui.
 2019-11-29 08:47:35 -05:00
Matthias Clasen
c0b8eb30de Fix a crash in gtk-builder-tool 
Crash pointed out by Bastien Nocera.

Testcase included.
 2019-08-26 15:34:15 +02:00
Lubomir Rintel
8799e5798b builder-tool: Rewrite GtkDialog 
Changes

  <object class="GtkDialog">
    <child internal-child="vbox">
      <...>
        <child internal-child="action_area">...</child>
        ...
      </...>
      <packing />
    </child>
  <object>

to

  <object class="GtkDialog">
    <child internal-child="content_area">
      <...>
        ...
      </...>
    </child>
    <child internal-child="action_area">...</child>
  <object>
 2019-05-31 17:03:12 +00:00
Matthias Clasen
2f37207487 Remove leftover debug spew 2019-05-30 08:19:08 -04:00
Matthias Clasen
93a34eb62d Merge branch 'lr/builder-tool-templates' into 'master' 
builder-tool: Rewrite GtkBuilder templates too

See merge request GNOME/gtk!888
 2019-05-30 11:56:05 +00:00
Lubomir Rintel
1e7225aa1c builder-tool: Set the parent of newly created GtkAssistantPage 
...and its property. Otherwise simplify_element() blows up when looking
up the hierarchy to determine a property type.

  $ gtk4-builder-tool simplify --3to4 /dev/stdin <<EOF
  > <?xml version="1.0" encoding="UTF-8"?>
  > <!-- Generated with glade 3.20.2 -->
  > <interface domain="nm-applet">
  >   <object class="GtkAssistant">
  >     <child>
  >       <object class="GtkBox" id="confirm_page">
  >       </object>
  >       <packing>
  >         <property name="page_type">confirm</property>
  >         <property name="complete">True</property>
  >       </packing>
  >     </child>
  >   </object>
  > </interface>
  > EOF
  /dev/stdin: Packing property GtkAssistant::page_type not found
  /dev/stdin: Packing property GtkAssistant::complete not found
  Segmentation fault (core dumped)
 2019-05-30 11:39:09 +02:00
Lubomir Rintel
2d55fce23d builder-tool: Rewrite GtkBuilder templates too 2019-05-30 10:34:24 +02:00
Matthias Clasen
a65696fc9f builder tool: Handle modal->autohide rename 
Add a facility for renamed properties,
and use it for GtkPopover::modal.
 2019-05-28 20:25:15 +00:00
Matthias Clasen
322507f24c builder-tool: Remove debug spew 2019-05-20 00:04:57 +00:00
Matthias Clasen
d8e92d4859 builder-tool: Handle layout properties more properly 
Change things so we first rewrite the whole tree,
and then simplify the rewritten tree. And look
for paramspecs for layout properties.
 2019-05-05 17:13:38 +00:00
Matthias Clasen
4eb00a3e41 builder-tool: Stop warnings for stack rewrites 
When rewriting a GtkStack from 3 to 4, we were emitting
warnings for missing child properties. Stop doing that.
 2019-05-05 17:13:38 +00:00
Matthias Clasen
09b6dbb7ef builder-tool: Handle default values changing 
The default value of GtkWidget::visible changed
from FALSE to TRUE from GTK 3 to 4. Make --3to4
deal with this by ensuring the visible property
is explicitly set, before simplifying.
 2019-05-04 23:41:30 -07:00
Matthias Clasen
40fe3d94ac builder-tool: Handle GtkWidget::visible properly 
This property has a 'smart' default that depends
on the class of the object we're creating. Take
that into account when deciding whether to omit
properties that are set to their default value.
 2019-05-04 18:18:42 +00:00
Matthias Clasen
491829a2b5 builder-tool: Check canonical names 
Always canonicalize names before comparing.
We were missing properties like left_attach,
since we were comparing them to left-attach.
 2019-04-23 17:30:00 -04:00
Matthias Clasen
28be1c5d3a builder-tool: Fix property check 
Embarrassingly, there was a missing else
causing us to check all packing properties
as object properties, never finding them.
 2019-04-23 21:25:59 +00:00
Matthias Clasen
1fab3d9e20 builder-tool: Handle layout properties gracefully 
If there are already layout properties in the ui
file, we shouldn't crash, even if --3to4 is given.
 2019-04-05 20:52:29 -04:00
Matthias Clasen
7cd9ea497b builder-tool: Stop using child properties 2019-04-05 12:01:43 +00:00
Matthias Clasen
fe822a0a24 builder-tool: Don't empty out <mark> elements 
We were inadvertedly losing the content of <mark>
elements. Fix this, by marking (!) them as pcdata
elements.
 2019-04-05 03:05:08 +00:00
Emmanuele Bassi
3ea39210cd builder-tool: Convert GtkGrid child properties 2019-04-05 00:04:14 +01:00
Matthias Clasen
c30fc92b3e builder-tool: Don't strip the xml declaration 
This is useful for interoperability with other tools.
 2019-03-28 19:28:05 -04:00
Matthias Clasen
8d993160c2 builder-tool: Small refactoring 
Introduce a PropKind enum, since the collection of
booleans is getting out of hands.
 2019-03-28 16:36:59 -04:00
Matthias Clasen
fc3cae34ec builder-tool: Convert overlay child properties 2019-03-28 16:36:59 -04:00
Matthias Clasen
3631878cee builder-tool: Rewrite paned child properties 2019-03-27 21:48:12 -04:00
Matthias Clasen
7e88fcf24e builder-tool: Rewrite toolbar child properties 2019-03-27 20:03:34 -04:00
Matthias Clasen
8c807303da builder-tool: Rewrite GtkPopoverMenu::submenu 2019-03-27 18:38:29 -04:00
Matthias Clasen
c507160bf2 builder-tool: Rewrite pack-type 
Replace GtkActionBar::pack-type and GtHeaderBar::pack-type
with child types when going from 3 to 4.
 2019-03-27 13:36:24 -04:00
Matthias Clasen
0fe1091ba8 builder-tool: Rewrite notebooks 
Just like we do for assistant and stack pages, rewrite
notebooks from child properties to child metas.
 2019-02-21 00:31:17 -05:00
Piotr Drąg
cf5f577834 Use Unicode typography in new translatable strings 
See https://developer.gnome.org/hig/stable/typography.html
 2019-02-08 19:24:53 +01:00
Matthias Clasen
915acce470 builder-tool: Fix preserving properties 
We were looking at the wrong class names here, we need
to look at the owner type to match against our list.

This fixes problems where gtk-builder-tool simplify
inadvertedly loses hexpand or vexpand settings, messing
up layout, as recently happend in gtk4-widget-factory.
 2019-02-08 10:34:32 -05:00
Matthias Clasen
b675597075 builder-tool: Convert assistant pages too 
Do the same transformation for GtkAssistantPage that
we already do for GtkStackPage, to transform GTK 3 .ui
files to GTK 4 ways of doing things.
 2019-02-08 00:09:44 -05:00
Matthias Clasen
72b6644223 builder tool: Operate on multiple files 
There is no strong reason to disallow this, when
the --replace option is used.
 2019-02-08 00:09:44 -05:00
Matthias Clasen
59152b8a8d builder tool: Rewrite the simplify command 
Rewrite the builder-tool simplify command to have
a full parse tree around, and perform simplifications
on that tree. This lets us rewrite GtkStack and turn
child properties into child meta objects.
 2019-02-08 00:09:44 -05:00
Matthias Clasen
addcf2e526 tools: Split gtk-builder-tool 
Put each command into its own file. This is in
preparation for redoing the simplify command.
 2019-02-08 00:09:44 -05:00