rpms/leafpad/devel leafpad-0.7.9-file_chooser.patch, NONE, 1.1 leafpad.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Ignacio Vazquez-Abrams (ivazquez)
fedora-extras-commits at redhat.com
Wed Mar 16 17:09:18 UTC 2005
Author: ivazquez
Update of /cvs/extras/rpms/leafpad/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4779/devel
Modified Files:
.cvsignore sources
Added Files:
leafpad-0.7.9-file_chooser.patch leafpad.spec
Log Message:
auto-import leafpad-0.7.9-1 on branch devel from leafpad-0.7.9-1.src.rpm
Initial import
leafpad-0.7.9-file_chooser.patch:
--- NEW FILE leafpad-0.7.9-file_chooser.patch ---
diff -uNr leafpad-0.7.9.orig/src/callback.c leafpad-0.7.9/src/callback.c
--- leafpad-0.7.9.orig/src/callback.c 2004-12-20 03:58:26.000000000 -0800
+++ leafpad-0.7.9/src/callback.c 2004-12-28 18:43:09.000000000 -0800
@@ -93,7 +93,7 @@
if (!check_text_modification(sd)) {
// fi = get_file_info_by_selector(OPEN, sd->fi);
- fi = get_fileinfo_from_selector(sd->mainwin->window, sd->fi, OPEN);
+ fi = get_fileinfo_from_chooser(sd->mainwin->window, sd->fi, OPEN);
if (fi) {
if (file_open_real(sd->mainwin->textview, fi)) {
g_free(fi);
@@ -123,7 +123,7 @@
{
FileInfo *fi;
- fi = get_fileinfo_from_selector(sd->mainwin->window, sd->fi, SAVE);
+ fi = get_fileinfo_from_chooser(sd->mainwin->window, sd->fi, SAVE);
if (fi) {
if (file_save_real(sd->mainwin->textview, fi))
g_free(fi);
diff -uNr leafpad-0.7.9.orig/src/selector.c leafpad-0.7.9/src/selector.c
--- leafpad-0.7.9.orig/src/selector.c 2004-12-24 01:35:12.000000000 -0800
+++ leafpad-0.7.9/src/selector.c 2004-12-28 19:00:29.000000000 -0800
@@ -310,7 +310,7 @@
return option_menu;
}
-static GtkWidget *create_file_selector(FileInfo *selected_fi)
+static GtkWidget *create_file_chooser(FileInfo *selected_fi, GtkWidget *window)
{
GtkWidget *filesel;
GtkWidget *align;
@@ -322,12 +322,19 @@
title = mode ? _("Open") : _("Save As");
- filesel = gtk_file_selection_new(title);
-// gtk_window_set_transient_for(GTK_WINDOW(filesel), GTK_WINDOW(window));
+ if(mode == OPEN)
+ filesel = gtk_file_chooser_dialog_new(title, GTK_WINDOW(window),
+ GTK_FILE_CHOOSER_ACTION_OPEN,
+ GTK_STOCK_CANCEL,GTK_RESPONSE_CANCEL,
+ GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,NULL);
+ else
+ filesel = gtk_file_chooser_dialog_new(title, GTK_WINDOW(window),
+ GTK_FILE_CHOOSER_ACTION_SAVE,
+ GTK_STOCK_CANCEL,GTK_RESPONSE_CANCEL,
+ GTK_STOCK_SAVE,GTK_RESPONSE_ACCEPT,NULL);
align = gtk_alignment_new(1, 0, 0, 0);
- gtk_box_pack_end(GTK_BOX(GTK_FILE_SELECTION(filesel)->main_vbox),
- align, FALSE, FALSE, 0);
+ gtk_file_chooser_set_extra_widget(GTK_FILE_CHOOSER(filesel),align);
table = gtk_table_new(2, 2, FALSE);
gtk_table_set_row_spacings(GTK_TABLE(table), 5);
gtk_container_add(GTK_CONTAINER(align), table);
@@ -340,15 +347,15 @@
option_menu_lineend = create_lineend_menu(selected_fi);
gtk_table_attach_defaults(GTK_TABLE(table), option_menu_lineend, 1, 2, 0, 1);
}
- gtk_widget_show_all(GTK_FILE_SELECTION(filesel)->main_vbox);
+ gtk_widget_show_all(GTK_FILE_CHOOSER(filesel));
if (selected_fi->filename)
- gtk_file_selection_set_filename(GTK_FILE_SELECTION(filesel), selected_fi->filename);
+ gtk_file_chooser_select_filename(GTK_FILE_CHOOSER(filesel), selected_fi->filename);
return filesel;
}
-FileInfo *get_fileinfo_from_selector(GtkWidget *window, FileInfo *fi, gint requested_mode)
+FileInfo *get_fileinfo_from_chooser(GtkWidget *window, FileInfo *fi, gint requested_mode)
{
FileInfo *selected_fi;
GtkWidget *filesel;
@@ -366,24 +373,24 @@
selected_fi->manual_charset =
fi->manual_charset ? g_strdup(fi->manual_charset) : NULL;
- filesel = create_file_selector(selected_fi);
+ filesel = create_file_chooser(selected_fi,window);
gtk_window_set_transient_for(GTK_WINDOW(filesel), GTK_WINDOW(window));
do {
res = gtk_dialog_run(GTK_DIALOG(filesel));
- if (res == GTK_RESPONSE_OK) {
+ if (res == GTK_RESPONSE_ACCEPT) {
if (selected_fi->filename)
g_free(selected_fi->filename);
selected_fi->filename = g_strdup(
- gtk_file_selection_get_filename(GTK_FILE_SELECTION(filesel)));
+ gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(filesel)));
if (g_file_test(selected_fi->filename, G_FILE_TEST_IS_DIR)) {
len = strlen(selected_fi->filename);
if (len < 1 || selected_fi->filename[len - 1] != G_DIR_SEPARATOR)
str = g_strconcat(selected_fi->filename, G_DIR_SEPARATOR_S, NULL);
else
str = g_strdup(selected_fi->filename);
- gtk_file_selection_set_filename(GTK_FILE_SELECTION(filesel), str);
+ gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(filesel), str);
g_free(str);
continue;
}
@@ -397,14 +404,14 @@
case GTK_RESPONSE_NO:
continue;
case GTK_RESPONSE_YES:
- res = GTK_RESPONSE_OK;
+ res = GTK_RESPONSE_ACCEPT;
}
}
}
gtk_widget_hide(filesel);
} while (GTK_WIDGET_VISIBLE(filesel));
- if (res != GTK_RESPONSE_OK) {
+ if (res != GTK_RESPONSE_ACCEPT) {
if (selected_fi->charset)
g_free(selected_fi->charset);
if (selected_fi->manual_charset)
diff -uNr leafpad-0.7.9.orig/src/selector.h leafpad-0.7.9/src/selector.h
--- leafpad-0.7.9.orig/src/selector.h 2004-12-20 16:51:06.000000000 -0800
+++ leafpad-0.7.9/src/selector.h 2004-12-28 18:43:09.000000000 -0800
@@ -30,6 +30,6 @@
OPEN
};
-FileInfo *get_fileinfo_from_selector(GtkWidget *window, FileInfo *fi, gint requested_mode);
+FileInfo *get_fileinfo_from_chooser(GtkWidget *window, FileInfo *fi, gint requested_mode);
#endif /* _SELECTOR_H */
--- NEW FILE leafpad.spec ---
Name: leafpad
Version: 0.7.9
Release: 1
Summary: GTK+ based simple text editor
Group: Applications/Editors
License: GPL
URL: http://tarot.freeshell.org/leafpad/
Source0: http://savannah.nongnu.org/download/leafpad/leafpad-0.7.9.tar.gz
Patch0: leafpad-0.7.9-file_chooser.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gtk2-devel >= 2.4
Requires: gtk2 >= 2.4
Requires(post): desktop-file-utils
Requires(postun): desktop-file-utils
%description
Leafpad is a GTK+ based simple text editor. The user interface is similar to Notepad. It aims to be lighter than GEdit and KWrite, and to be as useful as them.
%prep
%setup -q
%patch -p 1 -b .filechooser
%build
%configure
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm $RPM_BUILD_ROOT%{_datadir}/applications/leafpad.desktop
cat >> leafpad.desktop << EOF
StartupNotify=true
EOF
desktop-file-install --vendor=Fedora \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
--add-category X-Fedora \
--add-category Application \
--add-category Utility \
--add-category TextEditor \
--add-category GTK \
leafpad.desktop
%clean
rm -rf $RPM_BUILD_ROOT
%post
update-desktop-database
%postun
update-desktop-database
%files
%defattr(-,root,root,-)
%{_bindir}/leafpad
%{_datadir}/applications/Fedora-leafpad.desktop
%{_datadir}/locale/*/LC_MESSAGES/leafpad.mo
%{_datadir}/pixmaps/leafpad.png
%changelog
* Tue Mar 15 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.7.9-1
- Bump release to 1
* Thu Feb 3 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0:0.7.9-0.iva.0
- Initial RPM release.
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/leafpad/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 16 Mar 2005 17:08:48 -0000 1.1
+++ .cvsignore 16 Mar 2005 17:09:16 -0000 1.2
@@ -0,0 +1 @@
+leafpad-0.7.9.tar.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/leafpad/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 16 Mar 2005 17:08:48 -0000 1.1
+++ sources 16 Mar 2005 17:09:16 -0000 1.2
@@ -0,0 +1 @@
+01d851421f554cce3867e39bb258c414 leafpad-0.7.9.tar.gz
More information about the fedora-extras-commits
mailing list