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

63 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
Benjamin Otte
a278edab22 window: Remove type argument from gtk_window_new() 2020-02-14 21:18:49 +01:00
Matthias Clasen
59b935af38 Merge branch 'mainloop-cleanup' into 'master' 
Mainloop cleanup

See merge request GNOME/gtk!1404
 2020-02-10 14:32:09 +00:00
Alexander Larsson
1698369d52 Merge branch 'icon-theme-api-rework' into 'master' 
Icon theme api rework

See merge request GNOME/gtk!1390
 2020-02-10 12:45:56 +00:00
Matthias Clasen
a6c5466900 Stop using gtk_main and gtk_main_quit 
Replace these calls with direct use of GMainContext api.
 2020-02-09 23:12:32 -05:00
Matthias Clasen
2f17ab3ce7 Avoid mime sniffing where possible 
When we are loading symbolic pngs or svgs, we know
that we need to the png or svg loader, so there is
no need to go through (surprisingly expensive) mime
sniffing to find the right loader.
 2020-02-08 10:22:54 -05:00
Alexander Larsson
adccd1391e Support aspect=TRUE in _gdk_pixbuf_new_from_stream_at_scale 
The icon theme test failed without this, and we *should* handle
it if we're accepting the argument.
 2020-02-06 09:38:25 +01:00
Matthias Clasen
d03f38470e Fix encoding symbolic pixbufs 
This was broken in 1a931da046.
 2020-01-14 14:14:45 -05:00
Matthias Clasen
57a861723c buildertool: Drop menu properties 2019-12-29 20:31:58 -05:00
Matthias Clasen
c924b48a6c builder-tool: Validate templates again 
This wasn't working because it was expecting
some no-longer-existing error message.
 2019-12-23 18:32:37 -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
416b2cd18d Move symbolic pixbuf recoloring code 
This function is better off next to the other
symbolic png code in gdkpixbufutils.c.
 2019-10-18 08:53:23 -05:00
Matthias Clasen
3c219bf968 Add another symbolic pixbuf helper 2019-10-18 08:53:23 -05:00
Matthias Clasen
7197743938 pixbuf utils: Preserve format information 
When we are loading themed icons, we know if
we deal with an svg or png file, so it is
entirely unnecessarily to have gdk-pixbuf
use g_content_type guess to rediscover that
information.

Change the pixbuf utils apis we have to allow
passing format information down to where we
can use it when creating the pixbuf loader.
 2019-10-15 19:44:26 -04:00
Timm Bäder
c0827e2c54 pixbufutils: Escape file data only once 2019-09-09 17:36:27 +02:00
Timm Bäder
1a931da046 pixbufutils: Pass colors as string to load_symbolic_svg 
We were converting the same colors over and over again to a string, just
to free them again at the end of the function. We know the colors at
compile time however, so don't convert them at all.
 2019-09-09 17:36:27 +02:00
Timm Bäder
8eb62f138b pixbufutils: Only get icon size once 
load_symbolic_svg was loading the pixbuf just to get its size via
gdk_pixbuf_get_{width,height}. However, this function is called in a
loop in gtk_make_symbolic_pixbuf_from_data.

So, do this only once and pass the icon size along to load_symbolic_svg.
 2019-09-09 17:36:27 +02: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
Mohammed Sadiq
c1bb699151 builderparser: Allow bind-source without bind-property 
This allow users to bind same property of two objects with only
specifing “name” and “bind-source” in UI file.

Fixes https://gitlab.gnome.org/GNOME/gtk/issues/2080
 2019-08-10 19:01:36 +05:30
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
0c87b62251 Survive absence of librsvg without criticals 
We can't guarantee that we can load svgs, so
we shouldn't spew criticals when some of our
own resources fail to load due to that reason.
 2019-04-18 00:14:00 +00:00
Matthias Clasen
21be06310c builder-tool: Tweak --help output 2019-04-16 21:13:16 -04: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
Emmanuele Bassi
aacab81a3e Fix location on renamed files 
Commit 4152e14e32 renamed a bunch of
files, but did not fix the meson.build file that referenced them.
 2019-04-01 13:52:27 +01:00
Matthias Clasen
4152e14e32 Namespace some auxiliary files 
We install a few helper files for the ui file
format. Namespace these, to avoid conflict with
the same files in GTK3.
 2019-04-01 08:30:39 -04: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