rpms/ldm/F-9 ldm-rearrange-stuff.patch, NONE, 1.1 .cvsignore, 1.12, 1.13 ldm.spec, 1.17, 1.18 sources, 1.16, 1.17
Warren Togami 砥上勇
wtogami at fedoraproject.org
Sun Oct 12 16:11:26 UTC 2008
- Previous message: rpms/redet/devel .cvsignore, 1.4, 1.5 redet.spec, 1.3, 1.4 sources, 1.4, 1.5
- Next message: rpms/coreutils/devel coreutils-selinux.patch, 1.49, 1.50 coreutils.spec, 1.231, 1.232
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: wtogami
Update of /cvs/pkgs/rpms/ldm/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28186
Modified Files:
.cvsignore ldm.spec sources
Added Files:
ldm-rearrange-stuff.patch
Log Message:
Rearrange LDM layout, thanks to Ryan Niebur of Debian
ldm-rearrange-stuff.patch:
--- NEW FILE ldm-rearrange-stuff.patch ---
=== modified file 'gtkgreet/greeter.c'
--- gtkgreet/greeter.c 2008-10-03 03:50:48 +0000
+++ gtkgreet/greeter.c 2008-10-12 10:00:46 +0000
@@ -86,12 +86,12 @@
// use 12 hour clock format if LDM_12HOURCLOCK is set to true
if (ldm_getenv_bool("LDM_12HOURCLOCK")) {
- timestring = g_strdup_printf("%.2d:%.2d ",
+ timestring = g_strdup_printf("<b>%.2d:%.2d</b>",
(timePtr->tm_hour % 12) ? (timePtr->tm_hour % 12) : 12,
timePtr->tm_min);
}
else {
- timestring = g_strdup_printf("%.2d:%.2d ",
+ timestring = g_strdup_printf("<b>%.2d:%.2d</b>",
timePtr->tm_hour, timePtr->tm_min);
}
@@ -375,8 +375,8 @@
gint lh;
GdkCursor *normcursor, *busycursor;
- GtkWidget *window, *syslabel, *logo, *EntryBox, *timelabel;
- GtkWidget *GuestButton, *StatusBarBox, *spacer, *guestspacer1, *guestspacer2, *vbox, *vbox2, *hbox;
+ GtkWidget *window, *syslabel, *logo, *EntryBox, *timelabel, *bottom_right;
+ GtkWidget *GuestButton, *BottomBarBox, *TopBarBox, *spacer, *guestspacer1, *guestspacer2, *vbox, *vbox2, *hbox;
GtkWidget *timeoutspacer1, *timeoutspacer2, *timeoutlabel;
GtkWidget *entryspacer1, *entryspacer2;
GtkButton *optionbutton, *cancelbutton;
@@ -384,8 +384,10 @@
GdkPixbuf *rawpic, *pix;
GdkPixmap *pic;
GdkBitmap *mask;
- gint width, height;
+ gint width, height, has_bottom_right_image;
GIOChannel *g_stdin;
+ GtkWidget *optionbutton_box, *optionbutton_spacer;
+ GtkWidget *bottom_right_box, *bottom_right_spacer;
char * ldm_theme;
@@ -439,6 +441,12 @@
h = height;
logo = gtk_image_new_from_file(ldm_theme_file("/logo.png"));
+ if(access(ldm_theme_file("/bottom_right.png"), R_OK) == 0) {
+ bottom_right = gtk_image_new_from_file(ldm_theme_file("/bottom_right.png"));
+ has_bottom_right_image=TRUE;
+ }
+ else
+ has_bottom_right_image=FALSE;
pix = gtk_image_get_pixbuf((GtkImage *) logo);
lh = gdk_pixbuf_get_height(pix);
@@ -461,7 +469,8 @@
EntryBox = gtk_hbox_new(FALSE, 5);
hbox = gtk_hbox_new(FALSE, 0);
- StatusBarBox = gtk_hbox_new(FALSE, 0);
+ BottomBarBox = gtk_hbox_new(FALSE, 0);
+ TopBarBox = gtk_hbox_new(FALSE, 5);
optionbutton =
(GtkButton *) gtk_button_new_from_stock("gtk-preferences");
@@ -486,20 +495,32 @@
syslabel = gtk_label_new("");
timelabel = gtk_label_new("");
hoststring =
- g_strdup_printf("<b>%s (%s) //</b>", get_sysname(), getenv("LDMINFO_IPADDR"));
+ g_strdup_printf("<b>%s</b> (%s)", get_sysname(), getenv("LDMINFO_IPADDR"));
gtk_label_set_markup((GtkLabel *) syslabel, hoststring);
update_time(timelabel);
g_timeout_add(30000, (GSourceFunc) update_time, timelabel);
- gtk_box_pack_start(GTK_BOX(StatusBarBox),
- GTK_WIDGET(optionbutton), FALSE, FALSE, 5);
- /*gtk_box_pack_start(GTK_BOX(StatusBarBox),
+ optionbutton_box = gtk_vbox_new(FALSE, 0);
+ optionbutton_spacer = gtk_label_new("");
+ gtk_box_pack_start(GTK_BOX(optionbutton_box), GTK_WIDGET(optionbutton_spacer), TRUE, FALSE, 0);
+ gtk_box_pack_end(GTK_BOX(optionbutton_box), GTK_WIDGET(optionbutton), FALSE, FALSE, 5);
+ gtk_box_pack_start(GTK_BOX(BottomBarBox),
+ GTK_WIDGET(optionbutton_box), FALSE, FALSE, 5);
+ /*gtk_box_pack_start(GTK_BOX(BottomBarBox),
GTK_WIDGET(cancelbutton), FALSE, FALSE, 5);*/
- gtk_box_pack_end(GTK_BOX(StatusBarBox),
+ if(has_bottom_right_image == TRUE) {
+ bottom_right_box = gtk_vbox_new(FALSE, 0);
+ bottom_right_spacer = gtk_label_new("");
+ gtk_box_pack_start(GTK_BOX(bottom_right_box), GTK_WIDGET(bottom_right_spacer), TRUE, FALSE, 0);
+ gtk_box_pack_end(GTK_BOX(bottom_right_box), GTK_WIDGET(bottom_right), FALSE, FALSE, 0);
+ gtk_box_pack_end(GTK_BOX(BottomBarBox),
+ GTK_WIDGET(bottom_right_box), FALSE, FALSE, 0);
+ }
+ gtk_box_pack_start(GTK_BOX(TopBarBox),
+ GTK_WIDGET(syslabel), FALSE, FALSE, 5);
+ gtk_box_pack_end(GTK_BOX(TopBarBox),
GTK_WIDGET(timelabel), FALSE, FALSE, 5);
- gtk_box_pack_end(GTK_BOX(StatusBarBox),
- GTK_WIDGET(syslabel), FALSE, FALSE, 0);
UserPrompt = gtk_label_new("");
spacer = gtk_label_new("");
@@ -545,6 +566,15 @@
gtk_box_pack_start(GTK_BOX(EntryBox), entry, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(EntryBox), entryspacer2, TRUE, FALSE, 0);
+ gtk_box_pack_start(GTK_BOX(vbox2), TopBarBox, FALSE, FALSE, 5);
+
+ gtk_container_add(GTK_CONTAINER(window), vbox2);
+
+ gtk_widget_show_all(window);
+
+ gdk_window_set_cursor(root, normcursor);
+
+ spheight -= TopBarBox->allocation.height;
gtk_box_pack_start(GTK_BOX(vbox), spacer, FALSE, FALSE, spheight);
gtk_box_pack_start(GTK_BOX(vbox), logo, FALSE, FALSE, 5);
gtk_box_pack_start(GTK_BOX(vbox), EntryBox, TRUE, FALSE, 0);
@@ -553,14 +583,10 @@
gtk_box_pack_start(GTK_BOX(vbox), StatusMessages, TRUE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(hbox), vbox, TRUE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(vbox2), hbox, FALSE, FALSE, 0);
- gtk_box_pack_end(GTK_BOX(vbox2), StatusBarBox, FALSE, FALSE, 5);
-
- gtk_container_add(GTK_CONTAINER(window), vbox2);
+ gtk_box_pack_end(GTK_BOX(vbox2), BottomBarBox, FALSE, FALSE, 0);
gtk_widget_show_all(window);
- gdk_window_set_cursor(root, normcursor);
-
/*
* Start listening to stdin
*/
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ldm/F-9/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore 12 Oct 2008 06:34:14 -0000 1.12
+++ .cvsignore 12 Oct 2008 16:10:55 -0000 1.13
@@ -1,2 +1,2 @@
ldm-2.0.13.tar.bz2
-ldm-k12linux-theme-1.0.0.tar.bz2
+ldm-k12linux-theme-1.0.1.tar.bz2
Index: ldm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ldm/F-9/ldm.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ldm.spec 12 Oct 2008 06:34:15 -0000 1.17
+++ ldm.spec 12 Oct 2008 16:10:55 -0000 1.18
@@ -2,7 +2,7 @@
Version: 2.0.13
%define _datestamp .20080911.15
#Release: 7%{_datestamp}%{?dist}
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: LTSP Display Manager
Group: User Interface/X
@@ -10,7 +10,8 @@
URL: https://code.launchpad.net/~ltsp-upstream/ltsp/ldm-trunk
Source0: ldm-%{version}.tar.bz2
# Artwork by Maureen Duffy <duffy at redhat.com>
-Source1: ldm-k12linux-theme-1.0.0.tar.bz2
+Source1: ldm-k12linux-theme-1.0.1.tar.bz2
+Patch0: ldm-rearrange-stuff.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gtk2-devel
@@ -25,6 +26,7 @@
%prep
%setup -q
+%patch -p0
%build
@@ -37,7 +39,7 @@
make install DESTDIR=$RPM_BUILD_ROOT
cd $RPM_BUILD_ROOT/%{_datadir}/ldm/themes
tar xfvj %SOURCE1
- mv ldm-k12linux-theme-1.0.0 k12linux
+ mv ldm-k12linux-theme-1.0.1 k12linux
ln -s k12linux default
cd -
@@ -59,9 +61,10 @@
%dir %{_localstatedir}/run/ldm/
%changelog
-* Sun Oct 12 2008 Warren Togami <wtogami at redhat.com> - 2.0.13-1
+* Sun Oct 12 2008 Warren Togami <wtogami at redhat.com> - 2.0.13-2
- 2.0.13
- K12Linux theme by Maureen Duffy
+- Rearrange LDM layout, thanks to Ryan Niebur of Debian
* Wed Sep 10 2008 Warren Togami <wtogami at redhat.com> - 2.0.12-2
- remove /var/cache/ldm from package, renamed and shipped in ltsp-server instead
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ldm/F-9/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources 12 Oct 2008 06:34:15 -0000 1.16
+++ sources 12 Oct 2008 16:10:55 -0000 1.17
@@ -1,2 +1,2 @@
04cf63c329fc5ee9ebcc9326ce799c0f ldm-2.0.13.tar.bz2
-2c0aa06977806da9e351ff8a2762262a ldm-k12linux-theme-1.0.0.tar.bz2
+5b2cbbad73c92f47c65733ff181705cc ldm-k12linux-theme-1.0.1.tar.bz2
- Previous message: rpms/redet/devel .cvsignore, 1.4, 1.5 redet.spec, 1.3, 1.4 sources, 1.4, 1.5
- Next message: rpms/coreutils/devel coreutils-selinux.patch, 1.49, 1.50 coreutils.spec, 1.231, 1.232
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list