diff options
author | Alexander Mikhaylenko <alexm@gnome.org> | 2020-03-10 17:21:59 +0500 |
---|---|---|
committer | Alexander Mikhaylenko <alexm@gnome.org> | 2020-03-10 18:36:28 +0500 |
commit | 229d420ec56a0e1b749b214b0ef038283cef66a1 (patch) | |
tree | 9e40dfa7abbcb21a04d91c235f28ac22d58e8382 /src | |
parent | d3ca96b22beabf59997f0e8c769bc31d720a63ef (diff) | |
download | gnome-screenshot-229d420ec56a0e1b749b214b0ef038283cef66a1.tar.gz |
Move gresources to data/
Put icons into data/icons, ui files into data/ui/.
Diffstat (limited to 'src')
-rw-r--r-- | src/display-symbolic.svg | 5 | ||||
-rw-r--r-- | src/gnome-screenshot.gresource.xml | 11 | ||||
-rw-r--r-- | src/meson.build | 7 | ||||
-rw-r--r-- | src/screenshot-app-menu.ui | 14 | ||||
-rw-r--r-- | src/screenshot-dialog.c | 2 | ||||
-rw-r--r-- | src/screenshot-dialog.ui | 146 | ||||
-rw-r--r-- | src/screenshot-interactive-dialog.c | 4 | ||||
-rw-r--r-- | src/screenshot-interactive.ui | 425 | ||||
-rw-r--r-- | src/selection-symbolic.svg | 6 | ||||
-rw-r--r-- | src/window-symbolic.svg | 3 |
10 files changed, 3 insertions, 620 deletions
diff --git a/src/display-symbolic.svg b/src/display-symbolic.svg deleted file mode 100644 index 3eda6df..0000000 --- a/src/display-symbolic.svg +++ /dev/null @@ -1,5 +0,0 @@ -<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"> - <g fill="#2e3436"> - <path d="M3 1C1.338 1 0 2.338 0 4v7c0 1.662 1.338 3 3 3h10c1.662 0 3-1.338 3-3V4c0-1.662-1.338-3-3-3zm0 2h10c.554 0 1 .446 1 1v7c0 .554-.446 1-1 1H3c-.554 0-1-.446-1-1V4c0-.554.446-1 1-1zM8 16c3 0 4-1 4-1H4s1 1 4 1z"/> - </g> -</svg> diff --git a/src/gnome-screenshot.gresource.xml b/src/gnome-screenshot.gresource.xml deleted file mode 100644 index 91b4c98..0000000 --- a/src/gnome-screenshot.gresource.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<gresources> - <gresource prefix="/org/gnome/screenshot"> - <file alias="icons/display-symbolic.svg">display-symbolic.svg</file> - <file alias="icons/selection-symbolic.svg">selection-symbolic.svg</file> - <file alias="icons/window-symbolic.svg">window-symbolic.svg</file> - <file preprocess="xml-stripblanks">screenshot-app-menu.ui</file> - <file preprocess="xml-stripblanks">screenshot-interactive.ui</file> - <file preprocess="xml-stripblanks">screenshot-dialog.ui</file> - </gresource> -</gresources> diff --git a/src/meson.build b/src/meson.build index bfe89d6..6335614 100644 --- a/src/meson.build +++ b/src/meson.build @@ -1,5 +1,3 @@ -gnome = import('gnome') - sources = [ 'gnome-screenshot.c', @@ -15,11 +13,6 @@ sources = [ 'screenshot-utils.c', ] -resources = gnome.compile_resources('screenshot-resources', - 'gnome-screenshot.gresource.xml', - source_dir: '.', - c_name: 'screenshot') - executable('gnome-screenshot', sources + resources, include_directories: [ root_inc, include_directories('.') ], dependencies: [ mathlib_dep, x11_dep, glib_dep, gtk_dep, canberra_dep ], diff --git a/src/screenshot-app-menu.ui b/src/screenshot-app-menu.ui deleted file mode 100644 index 51ca5de..0000000 --- a/src/screenshot-app-menu.ui +++ /dev/null @@ -1,14 +0,0 @@ -<interface> - <menu id="app-menu"> - <section> - <item> - <attribute name="action">app.help</attribute> - <attribute name="label" translatable="yes">Help</attribute> - </item> - <item> - <attribute name="action">app.about</attribute> - <attribute name="label" translatable="yes">About Screenshot</attribute> - </item> - </section> - </menu> -</interface> diff --git a/src/screenshot-dialog.c b/src/screenshot-dialog.c index 44797a8..f4f7f35 100644 --- a/src/screenshot-dialog.c +++ b/src/screenshot-dialog.c @@ -215,7 +215,7 @@ screenshot_dialog_new (GdkPixbuf *screenshot, dialog->user_data = user_data; ui = gtk_builder_new (); - res = gtk_builder_add_from_resource (ui, "/org/gnome/screenshot/screenshot-dialog.ui", NULL); + res = gtk_builder_add_from_resource (ui, "/org/gnome/screenshot/ui/screenshot-dialog.ui", NULL); g_assert (res != 0); dialog->dialog = GTK_WIDGET (gtk_builder_get_object (ui, "toplevel")); diff --git a/src/screenshot-dialog.ui b/src/screenshot-dialog.ui deleted file mode 100644 index 455ca30..0000000 --- a/src/screenshot-dialog.ui +++ /dev/null @@ -1,146 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.22.0 --> -<interface> - <requires lib="gtk+" version="3.22"/> - <object class="GtkApplicationWindow" id="toplevel"> - <property name="can_focus">False</property> - <property name="window_position">center</property> - <child type="titlebar"> - <object class="GtkHeaderBar"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="GtkButton" id="back_button"> - <property name="label" translatable="yes">_Cancel</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_underline">True</property> - </object> - </child> - <child> - <object class="GtkButton" id="save_button"> - <property name="label" translatable="yes">_Save</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="has_default">True</property> - <property name="receives_default">True</property> - <property name="use_underline">True</property> - <style> - <class name="suggested-action"/> - </style> - </object> - <packing> - <property name="pack_type">end</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkButton" id="copy_button"> - <property name="label" translatable="yes">C_opy to Clipboard</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="pack_type">end</property> - <property name="position">2</property> - </packing> - </child> - </object> - </child> - <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">fill</property> - <property name="valign">fill</property> - <property name="expand">True</property> - <property name="margin">24</property> - <property name="orientation">vertical</property> - <property name="spacing">24</property> - <child> - <object class="GtkDrawingArea" id="preview_darea"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="width-request">256</property> - <property name="height-request">256</property> - <property name="expand">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkGrid"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">center</property> - <property name="row_spacing">6</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="label" translatable="yes">_Name:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">filename_entry</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="label" translatable="yes">_Folder:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">save_widget</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="filename_entry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="width_chars">35</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkFileChooserButton" id="save_widget"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action">select-folder</property> - <property name="local_only">False</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - </child> - </object> -</interface> diff --git a/src/screenshot-interactive-dialog.c b/src/screenshot-interactive-dialog.c index 9888f90..7ba971e 100644 --- a/src/screenshot-interactive-dialog.c +++ b/src/screenshot-interactive-dialog.c @@ -232,8 +232,8 @@ screenshot_interactive_dialog_new (CaptureClickedCallback f, gpointer user_data) CaptureData *data; guint res; - ui = gtk_builder_new_from_resource ("/org/gnome/screenshot/screenshot-interactive.ui"); - res = gtk_builder_add_from_resource (ui, "/org/gnome/screenshot/screenshot-app-menu.ui", NULL); + ui = gtk_builder_new_from_resource ("/org/gnome/screenshot/ui/screenshot-interactive.ui"); + res = gtk_builder_add_from_resource (ui, "/org/gnome/screenshot/ui/screenshot-app-menu.ui", NULL); g_assert (res != 0); dialog = GTK_WIDGET (gtk_builder_get_object (ui, "screenshot_window")); diff --git a/src/screenshot-interactive.ui b/src/screenshot-interactive.ui deleted file mode 100644 index ff91032..0000000 --- a/src/screenshot-interactive.ui +++ /dev/null @@ -1,425 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.22.0 --> -<interface> - <requires lib="gtk+" version="3.20"/> - <object class="GtkAdjustment" id="adjustment1"> - <property name="upper">100</property> - <property name="step_increment">1</property> - <property name="page_increment">10</property> - </object> - <object class="GtkApplicationWindow" id="screenshot_window"> - <property name="can_focus">False</property> - <property name="resizable">False</property> - <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">center</property> - <property name="valign">center</property> - <property name="orientation">vertical</property> - <property name="spacing">24</property> - <property name="margin">24</property> - <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="label" translatable="yes">Capture Area</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">6</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="homogeneous">True</property> - <child> - <object class="GtkRadioButton" id="screen"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="border_width">0</property> - <property name="draw_indicator">False</property> - <property name="group">selection</property> - <signal name="toggled" handler="on_screen" swapped="no"/> - <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="border_width">12</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> - <child> - <object class="GtkImage" id="screen_img"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">display-symbolic</property> - <property name="pixel_size">32</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">end</property> - <property name="label" translatable="yes">_Screen</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">screen</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkRadioButton" id="window"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="active">True</property> - <property name="draw_indicator">False</property> - <property name="group">screen</property> - <signal name="toggled" handler="on_window" swapped="no"/> - <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="border_width">12</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> - <child> - <object class="GtkImage" id="window_img"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">window-symbolic</property> - <property name="pixel_size">32</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">end</property> - <property name="label" translatable="yes">_Window</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">window</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - </child> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkRadioButton" id="selection"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="draw_indicator">False</property> - <property name="group">screen</property> - <signal name="toggled" handler="on_selection" swapped="no"/> - <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="border_width">12</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> - <child> - <object class="GtkImage" id="selection_img"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">selection-symbolic</property> - <property name="pixel_size">32</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">end</property> - <property name="label" translatable="yes">Se_lection</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - <style> - <class name="linked"/> - </style> - </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">0</property> - </packing> - </child> - <child> - <object class="GtkFrame" id="frame"> - <property name="width_request">360</property> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label_xalign">0</property> - <property name="label_yalign">0</property> - <property name="shadow_type">in</property> - <child> - <object class="GtkAlignment"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="GtkListBox" id="listbox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="selection_mode">none</property> - <property name="activate_on_single_click">False</property> - <child> - <object class="GtkListBoxRow" id="pointerrow"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="border_width">12</property> - <property name="spacing">10</property> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Show _Pointer</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">pointer</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkSwitch" id="pointer"> - <property name="visible">True</property> - <property name="can_focus">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="pack_type">end</property> - <property name="position">1</property> - </packing> - </child> - </object> - </child> - </object> - </child> - <child> - <object class="GtkListBoxRow" id="shadowrow"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="border_width">12</property> - <property name="spacing">10</property> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Window S_hadow</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">shadow</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkSwitch" id="shadow"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="active">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="pack_type">end</property> - <property name="position">1</property> - </packing> - </child> - </object> - </child> - </object> - </child> - <child> - <object class="GtkListBoxRow" id="delayrow"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_start">6</property> - <property name="margin_end">6</property> - <property name="border_width">9</property> - <property name="spacing">10</property> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">_Delay in Seconds</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">delay</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="delay"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="text" translatable="yes">0</property> - <property name="input_purpose">number</property> - <property name="adjustment">adjustment1</property> - <property name="climb_rate">1</property> - <property name="snap_to_ticks">True</property> - <property name="numeric">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="pack_type">end</property> - <property name="position">1</property> - </packing> - </child> - </object> - </child> - </object> - </child> - </object> - </child> - </object> - </child> - <child type="label_item"> - <placeholder/> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - </object> - </child> - <child type="titlebar"> - <object class="GtkHeaderBar"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="show_close_button">True</property> - <child> - <object class="GtkButton" id="capture_button"> - <property name="label" translatable="yes">_Take Screenshot</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="action_name">app.screen-shot</property> - <property name="use_underline">True</property> - <style> - <class name="suggested-action"/> - </style> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkMenuButton" id="menu"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <child> - <object class="GtkImage"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">open-menu-symbolic</property> - </object> - </child> - </object> - <packing> - <property name="pack_type">end</property> - <property name="position">1</property> - </packing> - </child> - </object> - </child> - </object> -</interface> diff --git a/src/selection-symbolic.svg b/src/selection-symbolic.svg deleted file mode 100644 index 3f90112..0000000 --- a/src/selection-symbolic.svg +++ /dev/null @@ -1,6 +0,0 @@ -<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"> - <g fill="#2e3436"> - <path d="M1.017 4.995h1v1h-1zM3.017 4.995h1v1h-1zM5.017 4.995h1v1h-1zM7.017 4.995h1v1h-1zM9.017 4.995h1v1h-1zM11.049 4.995h1v1h-1zM11.049 6.995h1v1h-1zM11.049 8.995h1v1h-1zM11.049 10.995h1v1h-1zM11.049 12.995h1v1h-1zM9.017 12.995h1v1h-1zM7.017 12.995h1v1h-1zM5.017 12.995h1v1h-1zM3.017 12.995h1v1h-1zM1.017 12.995h1v1h-1zM1.017 10.995h1v1h-1zM1.017 8.995h1v1h-1zM1.017 6.995h1v1h-1z" style="marker:none"/> - <path d="M6.017 1.027a1 1 0 0 0-1 1v1.968h8v8h1a1 1 0 0 0 1-1V2.027a1 1 0 0 0-1-1zm-1 5.968v4a1 1 0 0 0 1 1h4v-2h-3v-3z" style="line-height:normal;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000;text-transform:none;text-orientation:mixed;shape-padding:0;isolation:auto;mix-blend-mode:normal;marker:none" color="#000" font-weight="400" font-family="sans-serif" white-space="normal" overflow="visible"/> - </g> -</svg> diff --git a/src/window-symbolic.svg b/src/window-symbolic.svg deleted file mode 100644 index 329363c..0000000 --- a/src/window-symbolic.svg +++ /dev/null @@ -1,3 +0,0 @@ -<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"> - <path d="M3.012 1.027c-1.215 0-1.994.779-1.995 1.95V14a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1V2.955c0-1.238-.8-1.928-1.972-1.928zm7.005 1.963h1v1h1v-1h1v1h-1v1h1v1h-1v-1h-1v1h-1v-1h1v-1h-1zm-7 4.076h10v5.935h-10z" style="line-height:normal;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000;text-transform:none;text-orientation:mixed;shape-padding:0;isolation:auto;mix-blend-mode:normal;marker:none" color="#000" font-weight="400" font-family="sans-serif" white-space="normal" overflow="visible" fill="#2e3436"/> -</svg> |