Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
openSUSE:12.2:ARM
nautilus-image-converter
nautilus-image-converter-git.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File nautilus-image-converter-git.patch of Package nautilus-image-converter
diff --git a/Makefile.am b/Makefile.am index 33db1bf..8e4a3de 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,20 +1,22 @@ -NULL = +SUBDIRS = data src po -SUBDIRS = \ - po \ - src \ - $(NULL) +DISTCHECK_CONFIGURE_FLAGS = --with-nautilusdir='$${libdir}/nautilus/extensions-2.0-distcheck' -EXTRA_DIST = \ - intltool-extract.in \ - intltool-update.in \ - intltool-merge.in \ - $(NULL) +ACLOCAL_AMFLAGS = -I m4 -DISTCLEANFILES = \ - intltool-extract \ - intltool-update \ - intltool-merge \ - po/.intltool-merge-cache \ - $(NULL) +INTLTOOL = \ + intltool-extract.in \ + intltool-merge.in \ + intltool-update.in + +EXTRA_DIST = \ + ChangeLog \ + AUTHORS \ + NEWS \ + $(INTLTOOL) + +DISTCLEANFILES = \ + intltool-extract \ + intltool-merge \ + intltool-update diff --git a/NEWS b/NEWS index 178d76e..10d44eb 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,17 @@ +Version x.x.x +============= +General + * Port to Gtk3/GNOME3 + * Fix distcheck so that it works without root privileges + * Enable silent build + +Translators + + * Yaron Shahrabani (he) + * Siegfried-Angel Gevatter Pujals (ca) + * Jens Wiesser (de) + * Svetoslav Stefanov (bg) + Version 0.3.0 ============= diff --git a/README b/README index e69de29..daf6fb7 100644 --- a/README +++ b/README @@ -0,0 +1,13 @@ +Nautilus-Image-Converter +======================== + +The Nautilus-Image-Converter extension allows you to resize/rotate images from Nautilus. + +Hacking: +======== + +n-i-c can be check out with the following command: + +git clone git://git.gnome.org/nautilus-image-converter + +Patches welcomed! diff --git a/configure.ac b/configure.ac index 0ab9533..bb0cc83 100644 --- a/configure.ac +++ b/configure.ac @@ -1,44 +1,67 @@ -AC_INIT([nautilus-image-converter], [0.3.0], [j@bitron.ch], [nautilus-image-converter]) +AC_INIT([nautilus-image-converter], [0.3.1], [j@bitron.ch], [nautilus-image-converter]) +AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_HEADERS(config.h) AM_INIT_AUTOMAKE([dist-bzip2]) +m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) AM_MAINTAINER_MODE # Checks for programs. AC_PROG_CC AC_DISABLE_STATIC +IT_PROG_INTLTOOL([0.35.0]) +AC_PROG_LIBTOOL +AC_PATH_PROG(PKG_CONFIG, pkg-config, no) + +GNOME_COMPILE_WARNINGS([maximum]) +GNOME_CXX_WARNINGS +GNOME_DEBUG_CHECK +GNOME_MAINTAINER_MODE_DEFINES AH_TEMPLATE([GETTEXT_PACKAGE], [Package name for gettext]) GETTEXT_PACKAGE=nautilus-image-converter AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE") AC_SUBST(GETTEXT_PACKAGE) AM_GLIB_GNU_GETTEXT -IT_PROG_INTLTOOL([0.35.0]) -AC_PROG_LIBTOOL -AC_PATH_PROG(PKG_CONFIG, pkg-config, no) AC_SUBST(CFLAGS) AC_SUBST(CPPFLAGS) AC_SUBST(LDFLAGS) -NAUTILUS_REQUIRED=2.21.0 -GLIB_REQUIRED=2.15.0 -GTK_REQUIRED=2.12.0 -LIBGLADE_REQUIRED=2.4.0 +NAUTILUS_REQUIRED=3.0.0 +GLIB_REQUIRED=2.28.0 +GTK_REQUIRED=3.0.0 -PKG_CHECK_MODULES(NAUTILUS, libnautilus-extension >= $NAUTILUS_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED) +PKG_CHECK_MODULES(NAUTILUS, +[ + libnautilus-extension >= $NAUTILUS_REQUIRED + gtk+-3.0 >= $GTK_REQUIRED + glib-2.0 >= $GLIB_REQUIRED + gio-2.0 >= $GLIB_REQUIRED +]) AC_SUBST(NAUTILUS_CFLAGS) AC_SUBST(NAUTILUS_LIBS) dnl ----------------------------------------------------------- dnl Use correct nautilus extensions directory dnl ----------------------------------------------------------- -NAUTILUS_EXTENSION_DIR=`$PKG_CONFIG --variable=extensiondir libnautilus-extension` -AC_SUBST(NAUTILUS_EXTENSION_DIR) +AC_ARG_WITH(nautilusdir, + AS_HELP_STRING([--with-nautilusdir=DIR],[Installation path for Nautilus extension @<:@auto@:>@]), + [ac_with_nautilusdir=$withval], + [ac_with_nautilusdir=""]) +if test "${ac_with_nautilusdir}" = ""; then + ac_with_nautilusdir=`pkg-config --variable=extensiondir libnautilus-extension` +fi + +AC_MSG_NOTICE([installing nautilus plugin in ${ac_with_nautilusdir}]) +AC_SUBST([NAUTILUS_EXTENSION_DIR],[${ac_with_nautilusdir}]) -AC_CONFIG_FILES([Makefile - src/Makefile - po/Makefile.in]) +AC_CONFIG_FILES([ + Makefile + data/Makefile + src/Makefile + po/Makefile.in +]) AC_OUTPUT diff --git a/data/Makefile.am b/data/Makefile.am new file mode 100644 index 0000000..1ac3d21 --- /dev/null +++ b/data/Makefile.am @@ -0,0 +1,6 @@ +builderdir = $(datadir)/nautilus-image-converter +builder_DATA = \ + nautilus-image-resize.ui \ + nautilus-image-rotate.ui + +EXTRA_DIST = $(builder_DATA) diff --git a/data/nautilus-image-resize.ui b/data/nautilus-image-resize.ui new file mode 100644 index 0000000..09a77fe --- /dev/null +++ b/data/nautilus-image-resize.ui @@ -0,0 +1,501 @@ +<?xml version="1.0" encoding="UTF-8"?> +<interface> + <!-- interface-requires gtk+ 3.0 --> + <object class="GtkAdjustment" id="adjustment1"> + <property name="lower">1</property> + <property name="upper">100</property> + <property name="value">50</property> + <property name="step_increment">1</property> + <property name="page_increment">10</property> + </object> + <object class="GtkAdjustment" id="adjustment2"> + <property name="lower">1</property> + <property name="upper">9999</property> + <property name="value">1000</property> + <property name="step_increment">1</property> + <property name="page_increment">10</property> + </object> + <object class="GtkAdjustment" id="adjustment3"> + <property name="lower">1</property> + <property name="upper">9999</property> + <property name="value">1000</property> + <property name="step_increment">1</property> + <property name="page_increment">10</property> + </object> + <object class="GtkListStore" id="model1"> + <columns> + <!-- column-name gchararray --> + <column type="gchararray"/> + </columns> + <data> + <row> + <col id="0">96x96</col> + </row> + <row> + <col id="0">128x128</col> + </row> + <row> + <col id="0">640x480</col> + </row> + <row> + <col id="0">800x600</col> + </row> + <row> + <col id="0">1024x768</col> + </row> + <row> + <col id="0">1280x960</col> + </row> + </data> + </object> + <object class="GtkDialog" id="resize_dialog"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="border_width">12</property> + <property name="title" translatable="yes">Resize Images</property> + <property name="type_hint">dialog</property> + <child internal-child="vbox"> + <object class="GtkBox" id="dialog-vbox1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="spacing">6</property> + <child> + <object class="GtkVBox" id="vbox1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="border_width">12</property> + <property name="spacing">12</property> + <child> + <object class="GtkLabel" id="label2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes"><b>Image Size</b></property> + <property name="use_markup">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkHBox" id="hbox2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="spacing">12</property> + <child> + <object class="GtkLabel" id="label5"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkVBox" id="vbox2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="spacing">6</property> + <child> + <object class="GtkHBox" id="hbox4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="spacing">6</property> + <child> + <object class="GtkRadioButton" id="default_size_radiobutton"> + <property name="label" translatable="yes">Select a size:</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_action_appearance">False</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="comboboxtext_size"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="has_entry">True</property> + <property name="entry_text_column">0</property> + <items> + <item translatable="yes">96x96</item> + <item translatable="yes">128x128</item> + <item translatable="yes">640x480</item> + <item translatable="yes">800x600</item> + <item translatable="yes">1024x768</item> + <item translatable="yes">1280x960</item> + </items> + <child internal-child="entry"> + <object class="GtkEntry" id="comboboxentry-entry"> + <property name="can_focus">False</property> + <property name="editable">False</property> + </object> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label9"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">pixels</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">2</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkHBox" id="hbox8"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="spacing">6</property> + <child> + <object class="GtkRadioButton" id="custom_pct_radiobutton"> + <property name="label" translatable="yes">Scale:</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_action_appearance">False</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + <property name="group">default_size_radiobutton</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="pct_spinbutton"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="adjustment">adjustment1</property> + <property name="climb_rate">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="GtkLabel" id="label15"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">percent</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">2</property> + </packing> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkHBox" id="hbox5"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="spacing">6</property> + <child> + <object class="GtkRadioButton" id="custom_size_radiobutton"> + <property name="label" translatable="yes">Custom size:</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_action_appearance">False</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + <property name="group">default_size_radiobutton</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label10"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Width:</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="width_spinbutton"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="adjustment">adjustment2</property> + <property name="climb_rate">1</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="label11"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Height:</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="height_spinbutton"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="adjustment">adjustment3</property> + <property name="climb_rate">1</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="label14"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">pixels</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">5</property> + </packing> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">2</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">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes"><b>Filename</b></property> + <property name="use_markup">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkHBox" id="hbox6"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="spacing">12</property> + <child> + <object class="GtkLabel" id="label12"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkVBox" id="vbox3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="spacing">6</property> + <child> + <object class="GtkHBox" id="hbox7"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="spacing">6</property> + <child> + <object class="GtkRadioButton" id="append_radiobutton"> + <property name="label" translatable="yes">Append</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_action_appearance">False</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="name_entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="text" translatable="yes">.resized</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="label13"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">to file title</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">2</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="GtkRadioButton" id="inplace_radiobutton"> + <property name="label" translatable="yes">Resize in place</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_action_appearance">False</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + <property name="group">append_radiobutton</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</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">False</property> + <property name="fill">False</property> + <property name="position">3</property> + </packing> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child internal-child="action_area"> + <object class="GtkButtonBox" id="dialog-action_area1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="layout_style">end</property> + <child> + <object class="GtkButton" id="cancelbutton1"> + <property name="label">gtk-cancel</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="receives_default">False</property> + <property name="use_action_appearance">False</property> + <property name="use_stock">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="okbutton1"> + <property name="label" translatable="yes">_Resize</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="receives_default">False</property> + <property name="use_action_appearance">False</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> + </child> + <action-widgets> + <action-widget response="-6">cancelbutton1</action-widget> + <action-widget response="-5">okbutton1</action-widget> + </action-widgets> + </object> +</interface> diff --git a/data/nautilus-image-rotate.ui b/data/nautilus-image-rotate.ui new file mode 100644 index 0000000..c40ba9a --- /dev/null +++ b/data/nautilus-image-rotate.ui @@ -0,0 +1,309 @@ +<?xml version="1.0"?> +<!--*- mode: xml -*--> +<interface> + <object class="GtkAdjustment" id="adjustment1"> + <property name="upper">360</property> + <property name="lower">1</property> + <property name="page_increment">45</property> + <property name="step_increment">1</property> + <property name="page_size">45</property> + <property name="value">90</property> + </object> + <object class="GtkListStore" id="model1"> + <columns> + <column type="gchararray"/> + </columns> + <data> + <row> + <col id="0">90° clockwise</col> + </row> + <row> + <col id="0">90° counter-clockwise</col> + </row> + <row> + <col id="0">180°</col> + </row> + </data> + </object> + <object class="GtkDialog" id="rotate_dialog"> + <property name="visible">True</property> + <property name="border_width">12</property> + <property name="title" translatable="yes">Rotate Images</property> + <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property> + <property name="has_separator">False</property> + <child internal-child="vbox"> + <object class="GtkVBox" id="dialog-vbox1"> + <property name="visible">True</property> + <property name="spacing">6</property> + <child> + <object class="GtkVBox" id="vbox1"> + <property name="visible">True</property> + <property name="border_width">12</property> + <property name="spacing">12</property> + <child> + <object class="GtkLabel" id="label2"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes"><b>Image Rotation</b></property> + <property name="use_markup">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + <child> + <object class="GtkHBox" id="hbox2"> + <property name="visible">True</property> + <property name="spacing">12</property> + <child> + <object class="GtkLabel" id="label5"> + <property name="visible">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + <child> + <object class="GtkVBox" id="vbox2"> + <property name="visible">True</property> + <property name="spacing">6</property> + <child> + <object class="GtkHBox" id="hbox4"> + <property name="visible">True</property> + <property name="spacing">6</property> + <child> + <object class="GtkRadioButton" id="default_angle_radiobutton"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Select an angle:</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + <child> + <object class="GtkComboBox" id="angle_combobox"> + <property name="visible">True</property> + <property name="model">model1</property> + <child> + <object class="GtkCellRendererText" id="renderer1"/> + <attributes> + <attribute name="text">0</attribute> + </attributes> + </child> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + <child> + <object class="GtkHBox" id="hbox8"> + <property name="visible">True</property> + <property name="spacing">6</property> + <child> + <object class="GtkRadioButton" id="custom_angle_radiobutton"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Custom angle:</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + <property name="group">default_angle_radiobutton</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="angle_spinbutton"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="xalign">1</property> + <property name="adjustment">adjustment1</property> + <property name="climb_rate">1</property> + <property name="numeric">True</property> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label15"> + <property name="visible">True</property> + <property name="label" translatable="yes">degrees clockwise</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">2</property> + </packing> + </child> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label3"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes"><b>Filename</b></property> + <property name="use_markup">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkHBox" id="hbox6"> + <property name="visible">True</property> + <property name="spacing">12</property> + <child> + <object class="GtkLabel" id="label12"> + <property name="visible">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + <child> + <object class="GtkVBox" id="vbox3"> + <property name="visible">True</property> + <property name="spacing">6</property> + <child> + <object class="GtkHBox" id="hbox7"> + <property name="visible">True</property> + <property name="spacing">6</property> + <child> + <object class="GtkRadioButton" id="append_radiobutton"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Append</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="name_entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="text" translatable="yes">.rotated</property> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label13"> + <property name="visible">True</property> + <property name="label" translatable="yes">to file title</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">2</property> + </packing> + </child> + </object> + </child> + <child> + <object class="GtkRadioButton" id="inplace_radiobutton"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Rotate in place</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + <property name="group">append_radiobutton</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">3</property> + </packing> + </child> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + <child internal-child="action_area"> + <object class="GtkHButtonBox" id="dialog-action_area1"> + <property name="visible">True</property> + <property name="layout_style">GTK_BUTTONBOX_END</property> + <child> + <object class="GtkButton" id="cancelbutton1"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="label">gtk-cancel</property> + <property name="use_stock">True</property> + </object> + </child> + <child> + <object class="GtkButton" id="okbutton1"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="label" translatable="yes">_Rotate</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="pack_type">GTK_PACK_END</property> + </packing> + </child> + </object> + </child> + <action-widgets> + <action-widget response="-6">cancelbutton1</action-widget> + <action-widget response="-5">okbutton1</action-widget> + </action-widgets> + </object> +</interface> diff --git a/po/POTFILES.in b/po/POTFILES.in index f33d77f..66f888b 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,7 +1,8 @@ [encoding: UTF-8] # List of source files which contain translatable strings. +[type: gettext/glade]data/nautilus-image-resize.ui +[type: gettext/glade]data/nautilus-image-rotate.ui + src/nautilus-image-converter.c src/nautilus-image-resizer.c -src/nautilus-image-resize.glade src/nautilus-image-rotator.c -src/nautilus-image-rotate.glade diff --git a/src/Makefile.am b/src/Makefile.am index 6c95ceb..c8757c1 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,13 +1,10 @@ -NULL = - -INCLUDES = \ +AM_CPPFLAGS = \ -DG_LOG_DOMAIN=\"Nautilus-Image-Converter\" \ -DDATADIR=\"$(datadir)\" \ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ -I$(top_srcdir) \ -I$(top_builddir) \ $(WARN_CFLAGS) \ - -Werror \ $(DISABLE_DEPRECATED_CFLAGS) \ $(NAUTILUS_CFLAGS) @@ -15,20 +12,11 @@ nautilus_extensiondir=$(NAUTILUS_EXTENSION_DIR) nautilus_extension_LTLIBRARIES=libnautilus-image-converter.la -libnautilus_image_converter_la_SOURCES = \ - image-converter.c \ - nautilus-image-converter.c \ - nautilus-image-converter.h \ - nautilus-image-resizer.c \ - nautilus-image-resizer.h \ - nautilus-image-rotator.c \ - nautilus-image-rotator.h \ - $(NULL) +libnautilus_image_converter_la_SOURCES = \ + image-converter.c \ + nautilus-image-converter.c nautilus-image-converter.h \ + nautilus-image-resizer.c nautilus-image-resizer.h \ + nautilus-image-rotator.c nautilus-image-rotator.h libnautilus_image_converter_la_LDFLAGS = -module -avoid-version libnautilus_image_converter_la_LIBADD = $(NAUTILUS_LIBS) - -dist_pkgdata_DATA = \ - nautilus-image-resize.glade \ - nautilus-image-rotate.glade \ - $(NULL) diff --git a/src/image-converter.c b/src/image-converter.c index 0990d57..8d68340 100644 --- a/src/image-converter.c +++ b/src/image-converter.c @@ -31,6 +31,12 @@ static GType type_list[1]; +void nautilus_module_initialize (GTypeModule *module); +void nautilus_module_shutdown (void); +void nautilus_module_list_types (const GType **types, + int *num_types); + + void nautilus_module_initialize (GTypeModule *module) { diff --git a/src/nautilus-image-converter.c b/src/nautilus-image-converter.c index b4e07fe..e51bc33 100644 --- a/src/nautilus-image-converter.c +++ b/src/nautilus-image-converter.c @@ -32,13 +32,15 @@ #include <libnautilus-extension/nautilus-menu-provider.h> #include <glib/gi18n-lib.h> -#include <gtk/gtkicontheme.h> -#include <gtk/gtkwidget.h> +#include <gtk/gtk.h> #include <string.h> /* for strcmp */ static void nautilus_image_converter_instance_init (NautilusImageConverter *img); static void nautilus_image_converter_class_init (NautilusImageConverterClass *class); +GList * nautilus_image_converter_get_file_items (NautilusMenuProvider *provider, + GtkWidget *window, + GList *files); static GType image_converter_type = 0; diff --git a/src/nautilus-image-resize.glade b/src/nautilus-image-resize.glade deleted file mode 100644 index e2cb229..0000000 --- a/src/nautilus-image-resize.glade +++ /dev/null @@ -1,632 +0,0 @@ -<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*--> -<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd"> - -<glade-interface> - -<widget class="GtkDialog" id="resize_dialog"> - <property name="border_width">12</property> - <property name="visible">True</property> - <property name="title" translatable="yes">Resize Images</property> - <property name="type">GTK_WINDOW_TOPLEVEL</property> - <property name="window_position">GTK_WIN_POS_NONE</property> - <property name="modal">False</property> - <property name="resizable">True</property> - <property name="destroy_with_parent">False</property> - <property name="decorated">True</property> - <property name="skip_taskbar_hint">False</property> - <property name="skip_pager_hint">False</property> - <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property> - <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> - <property name="focus_on_map">True</property> - <property name="has_separator">False</property> - - <child internal-child="vbox"> - <widget class="GtkVBox" id="dialog-vbox1"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">6</property> - - <child internal-child="action_area"> - <widget class="GtkHButtonBox" id="dialog-action_area1"> - <property name="visible">True</property> - <property name="layout_style">GTK_BUTTONBOX_END</property> - - <child> - <widget class="GtkButton" id="cancelbutton1"> - <property name="visible">True</property> - <property name="can_default">True</property> - <property name="can_focus">True</property> - <property name="label">gtk-cancel</property> - <property name="use_stock">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="response_id">-6</property> - </widget> - </child> - - <child> - <widget class="GtkButton" id="okbutton1"> - <property name="visible">True</property> - <property name="can_default">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">_Resize</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="response_id">-5</property> - </widget> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="pack_type">GTK_PACK_END</property> - </packing> - </child> - - <child> - <widget class="GtkVBox" id="vbox1"> - <property name="border_width">12</property> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">12</property> - - <child> - <widget class="GtkLabel" id="label2"> - <property name="visible">True</property> - <property name="label" translatable="yes"><b>Image Size</b></property> - <property name="use_underline">False</property> - <property name="use_markup">True</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkHBox" id="hbox2"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">12</property> - - <child> - <widget class="GtkLabel" id="label5"> - <property name="visible">True</property> - <property name="label" translatable="yes"></property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkVBox" id="vbox2"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">6</property> - - <child> - <widget class="GtkHBox" id="hbox4"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">6</property> - - <child> - <widget class="GtkRadioButton" id="default_size_radiobutton"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Select a size:</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="active">False</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkComboBox" id="size_combobox"> - <property name="visible">True</property> - <property name="items">96x96 -128x128 -640x480 -800x600 -1024x768 -1280x960</property> - <property name="add_tearoffs">False</property> - <property name="focus_on_click">True</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label9"> - <property name="visible">True</property> - <property name="label" translatable="yes">pixels</property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkHBox" id="hbox8"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">6</property> - - <child> - <widget class="GtkRadioButton" id="custom_pct_radiobutton"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Scale:</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="active">False</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> - <property name="group">default_size_radiobutton</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkSpinButton" id="pct_spinbutton"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="climb_rate">1</property> - <property name="digits">0</property> - <property name="numeric">True</property> - <property name="update_policy">GTK_UPDATE_ALWAYS</property> - <property name="snap_to_ticks">False</property> - <property name="wrap">False</property> - <property name="adjustment">50 1 100 1 10 10</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label15"> - <property name="visible">True</property> - <property name="label" translatable="yes">percent</property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkHBox" id="hbox5"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">6</property> - - <child> - <widget class="GtkRadioButton" id="custom_size_radiobutton"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Custom size:</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="active">False</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> - <property name="group">default_size_radiobutton</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label10"> - <property name="visible">True</property> - <property name="label" translatable="yes">Width:</property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkSpinButton" id="width_spinbutton"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="climb_rate">1</property> - <property name="digits">0</property> - <property name="numeric">False</property> - <property name="update_policy">GTK_UPDATE_ALWAYS</property> - <property name="snap_to_ticks">False</property> - <property name="wrap">False</property> - <property name="adjustment">1000 1 9999 1 10 10</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label11"> - <property name="visible">True</property> - <property name="label" translatable="yes">Height:</property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkSpinButton" id="height_spinbutton"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="climb_rate">1</property> - <property name="digits">0</property> - <property name="numeric">False</property> - <property name="update_policy">GTK_UPDATE_ALWAYS</property> - <property name="snap_to_ticks">False</property> - <property name="wrap">False</property> - <property name="adjustment">1000 1 9999 1 10 10</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label14"> - <property name="visible">True</property> - <property name="label" translatable="yes">pixels</property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label3"> - <property name="visible">True</property> - <property name="label" translatable="yes"><b>Filename</b></property> - <property name="use_underline">False</property> - <property name="use_markup">True</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkHBox" id="hbox6"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">12</property> - - <child> - <widget class="GtkLabel" id="label12"> - <property name="visible">True</property> - <property name="label" translatable="yes"></property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkVBox" id="vbox3"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">6</property> - - <child> - <widget class="GtkHBox" id="hbox7"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">6</property> - - <child> - <widget class="GtkRadioButton" id="append_radiobutton"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Append</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="active">False</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkEntry" id="name_entry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="editable">True</property> - <property name="visibility">True</property> - <property name="max_length">0</property> - <property name="text" translatable="yes">.resized</property> - <property name="has_frame">True</property> - <property name="invisible_char">*</property> - <property name="activates_default">False</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label13"> - <property name="visible">True</property> - <property name="label" translatable="yes">to file title</property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkRadioButton" id="inplace_radiobutton"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Resize in place</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="active">False</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> - <property name="group">append_radiobutton</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - </widget> - </child> -</widget> - -</glade-interface> diff --git a/src/nautilus-image-resizer.c b/src/nautilus-image-resizer.c index 2a8a6ab..96cd92e 100644 --- a/src/nautilus-image-resizer.c +++ b/src/nautilus-image-resizer.c @@ -32,12 +32,9 @@ #include <glib/gi18n.h> #include <gio/gio.h> #include <gtk/gtk.h> -#include <glade/glade.h> #include <libnautilus-extension/nautilus-file-info.h> -#define PKGDATADIR DATADIR "/" PACKAGE - typedef struct _NautilusImageResizerPrivate NautilusImageResizerPrivate; struct _NautilusImageResizerPrivate { @@ -53,7 +50,7 @@ struct _NautilusImageResizerPrivate { GtkDialog *resize_dialog; GtkRadioButton *default_size_radiobutton; - GtkComboBox *size_combobox; + GtkComboBoxText *size_combobox; GtkRadioButton *custom_pct_radiobutton; GtkSpinButton *pct_spinbutton; GtkRadioButton *custom_size_radiobutton; @@ -164,7 +161,7 @@ nautilus_image_resizer_transform_filename (NautilusImageResizer *resizer, GFile NautilusImageResizerPrivate *priv = NAUTILUS_IMAGE_RESIZER_GET_PRIVATE (resizer); GFile *parent_file, *new_file; - char *basename, *extension, *new_path, *new_basename; + char *basename, *extension, *new_basename; g_return_val_if_fail (G_IS_FILE (orig_file), NULL); @@ -251,53 +248,12 @@ op_finished (GPid pid, gint status, gpointer data) } static void -nautilus_image_resizer_cancel_cb (GtkDialog *dialog, gint response_id, gpointer user_data) -{ - NautilusImageResizer *resizer = NAUTILUS_IMAGE_RESIZER (user_data); - NautilusImageResizerPrivate *priv = NAUTILUS_IMAGE_RESIZER_GET_PRIVATE (resizer); - - priv->cancelled = TRUE; - gtk_dialog_set_response_sensitive (dialog, GTK_RESPONSE_CANCEL, FALSE); -} - -static void run_op (NautilusImageResizer *resizer) { NautilusImageResizerPrivate *priv = NAUTILUS_IMAGE_RESIZER_GET_PRIVATE (resizer); g_return_if_fail (priv->files != NULL); - if (priv->progress_dialog == NULL) { - GtkWidget *vbox; - GtkWidget *label; - - priv->progress_dialog = gtk_dialog_new (); - gtk_window_set_title (GTK_WINDOW (priv->progress_dialog), "Resizing files"); - gtk_dialog_add_button (GTK_DIALOG (priv->progress_dialog), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL); - gtk_dialog_set_has_separator (GTK_DIALOG (priv->progress_dialog), FALSE); - g_signal_connect (priv->progress_dialog, "response", G_CALLBACK (nautilus_image_resizer_cancel_cb), resizer); - - vbox = GTK_DIALOG (priv->progress_dialog)->vbox; - gtk_container_set_border_width (GTK_CONTAINER (priv->progress_dialog), 5); - gtk_box_set_spacing (GTK_BOX (vbox), 8); - gtk_window_set_default_size (GTK_WINDOW (priv->progress_dialog), 400, -1); - - - label = gtk_label_new ("<big><b>Resizing images</b></big>"); - gtk_label_set_use_markup (GTK_LABEL (label), TRUE); - gtk_misc_set_alignment (GTK_MISC (label), 0, 0); - gtk_box_pack_start_defaults (GTK_BOX (vbox), label); - - priv->progress_bar = gtk_progress_bar_new (); - gtk_box_pack_start (GTK_BOX (vbox), priv->progress_bar, FALSE, FALSE, 0); - - priv->progress_label = gtk_label_new (""); - gtk_misc_set_alignment (GTK_MISC (priv->progress_label), 0, 0); - gtk_box_pack_start_defaults (GTK_BOX (vbox), priv->progress_label); - - gtk_widget_show_all (priv->progress_dialog); - } - NautilusFileInfo *file = NAUTILUS_FILE_INFO (priv->files->data); GFile *orig_location = nautilus_file_info_get_location (file); @@ -363,7 +319,7 @@ nautilus_image_resizer_response_cb (GtkDialog *dialog, gint response_id, gpointe priv->suffix = g_strdup (gtk_entry_get_text (priv->name_entry)); } if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->default_size_radiobutton))) { - priv->size = gtk_combo_box_get_active_text (GTK_COMBO_BOX (priv->size_combobox)); + priv->size = gtk_combo_box_text_get_active_text (GTK_COMBO_BOX_TEXT (priv->size_combobox)); } else if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->custom_pct_radiobutton))) { priv->size = g_strdup_printf ("%d%%", (int) gtk_spin_button_get_value (priv->pct_spinbutton)); } else { @@ -381,24 +337,48 @@ nautilus_image_resizer_init(NautilusImageResizer *resizer) { NautilusImageResizerPrivate *priv = NAUTILUS_IMAGE_RESIZER_GET_PRIVATE (resizer); - GladeXML *xml_dialog; - - xml_dialog = glade_xml_new (PKGDATADIR "/nautilus-image-resize.glade", - NULL, GETTEXT_PACKAGE); - priv->resize_dialog = GTK_DIALOG (glade_xml_get_widget (xml_dialog, "resize_dialog")); - priv->default_size_radiobutton = GTK_RADIO_BUTTON (glade_xml_get_widget (xml_dialog, "default_size_radiobutton")); - priv->size_combobox = GTK_COMBO_BOX (glade_xml_get_widget (xml_dialog, "size_combobox")); - gtk_combo_box_set_active (priv->size_combobox, 4); /* 1024x768 */ - priv->custom_pct_radiobutton = GTK_RADIO_BUTTON (glade_xml_get_widget (xml_dialog, "custom_pct_radiobutton")); - priv->pct_spinbutton = GTK_SPIN_BUTTON (glade_xml_get_widget (xml_dialog, "pct_spinbutton")); - priv->custom_size_radiobutton = GTK_RADIO_BUTTON (glade_xml_get_widget (xml_dialog, "custom_size_radiobutton")); - priv->width_spinbutton = GTK_SPIN_BUTTON (glade_xml_get_widget (xml_dialog, "width_spinbutton")); - priv->height_spinbutton = GTK_SPIN_BUTTON (glade_xml_get_widget (xml_dialog, "height_spinbutton")); - priv->append_radiobutton = GTK_RADIO_BUTTON (glade_xml_get_widget (xml_dialog, "append_radiobutton")); - priv->name_entry = GTK_ENTRY (glade_xml_get_widget (xml_dialog, "name_entry")); - priv->inplace_radiobutton = GTK_RADIO_BUTTON (glade_xml_get_widget (xml_dialog, "inplace_radiobutton")); - - g_signal_connect (G_OBJECT (priv->resize_dialog), "response", (GCallback) nautilus_image_resizer_response_cb, resizer); + GtkBuilder *ui; + gchar *path; + guint result; + GError *err = NULL; + + /* Let's create our gtkbuilder and load the xml file */ + ui = gtk_builder_new (); + gtk_builder_set_translation_domain (ui, GETTEXT_PACKAGE); + path = g_build_filename (DATADIR, PACKAGE, "nautilus-image-resize.ui", NULL); + result = gtk_builder_add_from_file (ui, path, &err); + g_free (path); + + /* If we're unable to load the xml file */ + if (result == 0) { + g_warning ("%s", err->message); + g_error_free (err); + return; + } + + /* Grab some widgets */ + priv->resize_dialog = GTK_DIALOG (gtk_builder_get_object (ui, "resize_dialog")); + priv->default_size_radiobutton = + GTK_RADIO_BUTTON (gtk_builder_get_object (ui, "default_size_radiobutton")); + priv->size_combobox = GTK_COMBO_BOX_TEXT (gtk_builder_get_object (ui, "comboboxtext_size")); + priv->custom_pct_radiobutton = + GTK_RADIO_BUTTON (gtk_builder_get_object (ui, "custom_pct_radiobutton")); + priv->pct_spinbutton = GTK_SPIN_BUTTON (gtk_builder_get_object (ui, "pct_spinbutton")); + priv->custom_size_radiobutton = + GTK_RADIO_BUTTON (gtk_builder_get_object (ui, "custom_size_radiobutton")); + priv->width_spinbutton = GTK_SPIN_BUTTON (gtk_builder_get_object (ui, "width_spinbutton")); + priv->height_spinbutton = GTK_SPIN_BUTTON (gtk_builder_get_object (ui, "height_spinbutton")); + priv->append_radiobutton = GTK_RADIO_BUTTON (gtk_builder_get_object (ui, "append_radiobutton")); + priv->name_entry = GTK_ENTRY (gtk_builder_get_object (ui, "name_entry")); + priv->inplace_radiobutton = GTK_RADIO_BUTTON (gtk_builder_get_object (ui, "inplace_radiobutton")); + + /* Set default item in combo box */ + /* gtk_combo_box_set_active (priv->size_combobox, 4); 1024x768 */ + + /* Connect signal */ + g_signal_connect (G_OBJECT (priv->resize_dialog), "response", + (GCallback) nautilus_image_resizer_response_cb, + resizer); } NautilusImageResizer * diff --git a/src/nautilus-image-resizer.h b/src/nautilus-image-resizer.h index 81ee0f3..d6e1a06 100644 --- a/src/nautilus-image-resizer.h +++ b/src/nautilus-image-resizer.h @@ -47,7 +47,7 @@ struct _NautilusImageResizerClass { /* Add Signal Functions Here */ }; -GType nautilus_image_resizer_get_type (); +GType nautilus_image_resizer_get_type (void); NautilusImageResizer *nautilus_image_resizer_new (GList *files); void nautilus_image_resizer_show_dialog (NautilusImageResizer *dialog); diff --git a/src/nautilus-image-rotate.glade b/src/nautilus-image-rotate.glade deleted file mode 100644 index 9a79364..0000000 --- a/src/nautilus-image-rotate.glade +++ /dev/null @@ -1,280 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd"> -<!--*- mode: xml -*--> -<glade-interface> - <widget class="GtkDialog" id="rotate_dialog"> - <property name="visible">True</property> - <property name="border_width">12</property> - <property name="title" translatable="yes">Rotate Images</property> - <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property> - <property name="has_separator">False</property> - <child internal-child="vbox"> - <widget class="GtkVBox" id="dialog-vbox1"> - <property name="visible">True</property> - <property name="spacing">6</property> - <child> - <widget class="GtkVBox" id="vbox1"> - <property name="visible">True</property> - <property name="border_width">12</property> - <property name="spacing">12</property> - <child> - <widget class="GtkLabel" id="label2"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes"><b>Image Rotation</b></property> - <property name="use_markup">True</property> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - <child> - <widget class="GtkHBox" id="hbox2"> - <property name="visible">True</property> - <property name="spacing">12</property> - <child> - <widget class="GtkLabel" id="label5"> - <property name="visible">True</property> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - <child> - <widget class="GtkVBox" id="vbox2"> - <property name="visible">True</property> - <property name="spacing">6</property> - <child> - <widget class="GtkHBox" id="hbox4"> - <property name="visible">True</property> - <property name="spacing">6</property> - <child> - <widget class="GtkRadioButton" id="default_angle_radiobutton"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Select an angle:</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - <child> - <widget class="GtkComboBox" id="angle_combobox"> - <property name="visible">True</property> - <property name="items" translatable="yes">90° clockwise -90° counter-clockwise -180°</property> - </widget> - <packing> - <property name="position">1</property> - </packing> - </child> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - <child> - <widget class="GtkHBox" id="hbox8"> - <property name="visible">True</property> - <property name="spacing">6</property> - <child> - <widget class="GtkRadioButton" id="custom_angle_radiobutton"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Custom angle:</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> - <property name="group">default_angle_radiobutton</property> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - <child> - <widget class="GtkSpinButton" id="angle_spinbutton"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="xalign">1</property> - <property name="adjustment">90 1 360 1 45 45</property> - <property name="climb_rate">1</property> - <property name="numeric">True</property> - </widget> - <packing> - <property name="position">1</property> - </packing> - </child> - <child> - <widget class="GtkLabel" id="label15"> - <property name="visible">True</property> - <property name="label" translatable="yes">degrees clockwise</property> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">2</property> - </packing> - </child> - </widget> - <packing> - <property name="position">1</property> - </packing> - </child> - </widget> - <packing> - <property name="position">1</property> - </packing> - </child> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - <child> - <widget class="GtkLabel" id="label3"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes"><b>Filename</b></property> - <property name="use_markup">True</property> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">2</property> - </packing> - </child> - <child> - <widget class="GtkHBox" id="hbox6"> - <property name="visible">True</property> - <property name="spacing">12</property> - <child> - <widget class="GtkLabel" id="label12"> - <property name="visible">True</property> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - <child> - <widget class="GtkVBox" id="vbox3"> - <property name="visible">True</property> - <property name="spacing">6</property> - <child> - <widget class="GtkHBox" id="hbox7"> - <property name="visible">True</property> - <property name="spacing">6</property> - <child> - <widget class="GtkRadioButton" id="append_radiobutton"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Append</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - <child> - <widget class="GtkEntry" id="name_entry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="text" translatable="yes">.rotated</property> - </widget> - <packing> - <property name="position">1</property> - </packing> - </child> - <child> - <widget class="GtkLabel" id="label13"> - <property name="visible">True</property> - <property name="label" translatable="yes">to file title</property> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">2</property> - </packing> - </child> - </widget> - </child> - <child> - <widget class="GtkRadioButton" id="inplace_radiobutton"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Rotate in place</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> - <property name="group">append_radiobutton</property> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - </widget> - <packing> - <property name="position">1</property> - </packing> - </child> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">3</property> - </packing> - </child> - </widget> - <packing> - <property name="position">1</property> - </packing> - </child> - <child internal-child="action_area"> - <widget class="GtkHButtonBox" id="dialog-action_area1"> - <property name="visible">True</property> - <property name="layout_style">GTK_BUTTONBOX_END</property> - <child> - <widget class="GtkButton" id="cancelbutton1"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="label">gtk-cancel</property> - <property name="use_stock">True</property> - <property name="response_id">-6</property> - </widget> - </child> - <child> - <widget class="GtkButton" id="okbutton1"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="label" translatable="yes">_Rotate</property> - <property name="use_underline">True</property> - <property name="response_id">-5</property> - </widget> - <packing> - <property name="position">1</property> - </packing> - </child> - </widget> - <packing> - <property name="expand">False</property> - <property name="pack_type">GTK_PACK_END</property> - </packing> - </child> - </widget> - </child> - </widget> -</glade-interface> diff --git a/src/nautilus-image-rotator.c b/src/nautilus-image-rotator.c index 13db6a4..59390f1 100644 --- a/src/nautilus-image-rotator.c +++ b/src/nautilus-image-rotator.c @@ -32,12 +32,9 @@ #include <glib/gi18n.h> #include <gio/gio.h> #include <gtk/gtk.h> -#include <glade/glade.h> #include <libnautilus-extension/nautilus-file-info.h> -#define PKGDATADIR DATADIR "/" PACKAGE - typedef struct _NautilusImageRotatorPrivate NautilusImageRotatorPrivate; struct _NautilusImageRotatorPrivate { @@ -161,7 +158,7 @@ nautilus_image_rotator_transform_filename (NautilusImageRotator *rotator, GFile NautilusImageRotatorPrivate *priv = NAUTILUS_IMAGE_ROTATOR_GET_PRIVATE (rotator); GFile *parent_file, *new_file; - char *basename, *extension, *new_path, *new_basename; + char *basename, *extension, *new_basename; g_return_val_if_fail (G_IS_FILE (orig_file), NULL); @@ -248,53 +245,12 @@ op_finished (GPid pid, gint status, gpointer data) } static void -nautilus_image_rotator_cancel_cb (GtkDialog *dialog, gint response_id, gpointer user_data) -{ - NautilusImageRotator *rotator = NAUTILUS_IMAGE_ROTATOR (user_data); - NautilusImageRotatorPrivate *priv = NAUTILUS_IMAGE_ROTATOR_GET_PRIVATE (rotator); - - priv->cancelled = TRUE; - gtk_dialog_set_response_sensitive (dialog, GTK_RESPONSE_CANCEL, FALSE); -} - -static void run_op (NautilusImageRotator *rotator) { NautilusImageRotatorPrivate *priv = NAUTILUS_IMAGE_ROTATOR_GET_PRIVATE (rotator); g_return_if_fail (priv->files != NULL); - if (priv->progress_dialog == NULL) { - GtkWidget *vbox; - GtkWidget *label; - - priv->progress_dialog = gtk_dialog_new (); - gtk_window_set_title (GTK_WINDOW (priv->progress_dialog), "Rotating files"); - gtk_dialog_add_button (GTK_DIALOG (priv->progress_dialog), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL); - gtk_dialog_set_has_separator (GTK_DIALOG (priv->progress_dialog), FALSE); - g_signal_connect (priv->progress_dialog, "response", G_CALLBACK (nautilus_image_rotator_cancel_cb), rotator); - - vbox = GTK_DIALOG (priv->progress_dialog)->vbox; - gtk_container_set_border_width (GTK_CONTAINER (priv->progress_dialog), 5); - gtk_box_set_spacing (GTK_BOX (vbox), 8); - gtk_window_set_default_size (GTK_WINDOW (priv->progress_dialog), 400, -1); - - - label = gtk_label_new ("<big><b>Rotating images</b></big>"); - gtk_label_set_use_markup (GTK_LABEL (label), TRUE); - gtk_misc_set_alignment (GTK_MISC (label), 0, 0); - gtk_box_pack_start_defaults (GTK_BOX (vbox), label); - - priv->progress_bar = gtk_progress_bar_new (); - gtk_box_pack_start (GTK_BOX (vbox), priv->progress_bar, FALSE, FALSE, 0); - - priv->progress_label = gtk_label_new (""); - gtk_misc_set_alignment (GTK_MISC (priv->progress_label), 0, 0); - gtk_box_pack_start_defaults (GTK_BOX (vbox), priv->progress_label); - - gtk_widget_show_all (priv->progress_dialog); - } - NautilusFileInfo *file = NAUTILUS_FILE_INFO (priv->files->data); GFile *orig_location = nautilus_file_info_get_location (file); @@ -392,21 +348,47 @@ nautilus_image_rotator_init(NautilusImageRotator *rotator) { NautilusImageRotatorPrivate *priv = NAUTILUS_IMAGE_ROTATOR_GET_PRIVATE (rotator); - GladeXML *xml_dialog; + GtkBuilder *ui; + gchar *path; + guint result; + GError *err = NULL; + + /* Let's create our gtkbuilder and load the xml file */ + ui = gtk_builder_new (); + gtk_builder_set_translation_domain (ui, GETTEXT_PACKAGE); + path = g_build_filename (DATADIR, PACKAGE, "nautilus-image-rotate.ui", NULL); + result = gtk_builder_add_from_file (ui, path, &err); + g_free (path); + + /* If we're unable to load the xml file */ + if (result == 0) { + g_warning ("%s", err->message); + g_error_free (err); + return; + } - xml_dialog = glade_xml_new (PKGDATADIR "/nautilus-image-rotate.glade", - NULL, GETTEXT_PACKAGE); - priv->rotate_dialog = GTK_DIALOG (glade_xml_get_widget (xml_dialog, "rotate_dialog")); - priv->default_angle_radiobutton = GTK_RADIO_BUTTON (glade_xml_get_widget (xml_dialog, "default_angle_radiobutton")); - priv->angle_combobox = GTK_COMBO_BOX (glade_xml_get_widget (xml_dialog, "angle_combobox")); + /* Grab some widgets */ + priv->rotate_dialog = GTK_DIALOG (gtk_builder_get_object (ui, "rotate_dialog")); + priv->default_angle_radiobutton = + GTK_RADIO_BUTTON (gtk_builder_get_object (ui, "default_angle_radiobutton")); + priv->angle_combobox = GTK_COMBO_BOX (gtk_builder_get_object (ui, "angle_combobox")); + priv->custom_angle_radiobutton = + GTK_RADIO_BUTTON (gtk_builder_get_object (ui, "custom_angle_radiobutton")); + priv->angle_spinbutton = + GTK_SPIN_BUTTON (gtk_builder_get_object (ui, "angle_spinbutton")); + priv->append_radiobutton = + GTK_RADIO_BUTTON (gtk_builder_get_object (ui, "append_radiobutton")); + priv->name_entry = GTK_ENTRY (gtk_builder_get_object (ui, "name_entry")); + priv->inplace_radiobutton = + GTK_RADIO_BUTTON (gtk_builder_get_object (ui, "inplace_radiobutton")); + + /* Set default value for combobox */ gtk_combo_box_set_active (priv->angle_combobox, 0); /* 90° clockwise */ - priv->custom_angle_radiobutton = GTK_RADIO_BUTTON (glade_xml_get_widget (xml_dialog, "custom_angle_radiobutton")); - priv->angle_spinbutton = GTK_SPIN_BUTTON (glade_xml_get_widget (xml_dialog, "angle_spinbutton")); - priv->append_radiobutton = GTK_RADIO_BUTTON (glade_xml_get_widget (xml_dialog, "append_radiobutton")); - priv->name_entry = GTK_ENTRY (glade_xml_get_widget (xml_dialog, "name_entry")); - priv->inplace_radiobutton = GTK_RADIO_BUTTON (glade_xml_get_widget (xml_dialog, "inplace_radiobutton")); - - g_signal_connect (G_OBJECT (priv->rotate_dialog), "response", (GCallback) nautilus_image_rotator_response_cb, rotator); + + /* Connect the signal */ + g_signal_connect (G_OBJECT (priv->rotate_dialog), "response", + (GCallback) nautilus_image_rotator_response_cb, + rotator); } NautilusImageRotator * diff --git a/src/nautilus-image-rotator.h b/src/nautilus-image-rotator.h index 41a0b6f..8d81379 100644 --- a/src/nautilus-image-rotator.h +++ b/src/nautilus-image-rotator.h @@ -47,7 +47,7 @@ struct _NautilusImageRotatorClass { /* Add Signal Functions Here */ }; -GType nautilus_image_rotator_get_type (); +GType nautilus_image_rotator_get_type (void); NautilusImageRotator *nautilus_image_rotator_new (GList *files); void nautilus_image_rotator_show_dialog (NautilusImageRotator *dialog);
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
