Attachment #16142 for bug #26688

View | Details | Raw Unified | Return to bug 26688
Collapse All | Expand All

Lines 1-6 Link Here

(-)syndigator-0.11.orig/syndigator (-1 / +1 lines)
1	#!/usr/bin/perl	1	#!/usr/bin/perl
2		2
3	use lib './lib';	3	use lib '/usr/lib/syndigator';
4	use strict;	4	use strict;
5	use Getopt::Long;	5	use Getopt::Long;
6		6




sub run {
    my $c        = shift;
    my $importer = shift;
    my $images_dir = shift;

    my $w = new Gtk::Window;
    $w->set_title("Syndigator ".$importer->name()." importer");
    my $druid = Gnome::Druid->new(); 
    my $s = bless { _importer => $importer, _druid=>$druid}, $c;
    $s->{_logo} = load_image Gtk::Gdk::ImlibImage($images_dir.'logo-simple.xpm');

    my $start = Gnome::DruidPageStart->new();
    $start->set_title("Syndigator ".$importer->name()." importer: ");




use base qw(RSSReader::Logger RSSReader::GtkUI);

our $_main_window;
my $images_dir = '/usr/share/syndigator/images/';

sub new {
	my $c = shift;



	my $style = $window->get_style()->bg( 'normal' );
	my ( $l_pixmap, $l_mask ) = Gtk::Gdk::Pixmap->create_from_xpm( $window->window, $style, $images_dir.'logo-simple.xpm' );
	$window->window->set_icon($window->window, $l_pixmap, $l_mask);
	


		$s->{_online_button}->set_relief('none');
		$s->{_online_button}->show;
		$s->{_status_hbox}->pack_end($s->{_online_button},0,0,0);
		$s->{online_pix}  = Gnome::Pixmap->new_from_file($images_dir.'online.png');
		$s->{offline_pix} = Gnome::Pixmap->new_from_file($images_dir.'offline.png');
		$s->{online_pix}->show();
		$s->{offline_pix}->show();
		$s->{_online_button_tooltips} = new Gtk::Tooltips();

        my @importers = RSSReader::Importer->get_importers();
        foreach my $importer (@importers) {
          my $imp_item = Gnome::Stock->menu_item( "Add", $importer->name() );
          $imp_item->signal_connect( 'activate', sub{ RSSReader::GtkUI::ImporterDruid->run($importer, $images_dir) } );
	  $import_menu->append($imp_item);
        }
	$import_item->set_submenu($import_menu);

	my $help_menu = new Gtk::MenuItem("Help");
	my $help_submenu = new Gtk::Menu;
	my $about_item = Gnome::Stock->menu_item( "Menu_About", 'About' );
	$about_item->signal_connect('activate', sub {Gnome::About->new('Syndigator', $VERSION, undef, ['Bruno Tavares', 'Paulo Anes'],'http://syndigator.sf.net', $images_dir.'logo-124x22.xpm')->show()} );
	$about_item->show();
	$help_submenu->append($about_item);
        $help_menu->set_submenu($help_submenu);

Return to bug 26688

Lines 9-20 Link Here

(-)syndigator-0.11.orig/lib/RSSReader/GtkUI/ImporterDruid.pm (-1 / +2 lines)
9	sub run {	9	sub run {
10	my $c = shift;	10	my $c = shift;
11	my $importer = shift;	11	my $importer = shift;
		12	my $images_dir = shift;
12		13
13	my $w = new Gtk::Window;	14	my $w = new Gtk::Window;
14	$w->set_title("Syndigator ".$importer->name()." importer");	15	$w->set_title("Syndigator ".$importer->name()." importer");
15	my $druid = Gnome::Druid->new();	16	my $druid = Gnome::Druid->new();
16	my $s = bless { _importer => $importer, _druid=>$druid}, $c;	17	my $s = bless { _importer => $importer, _druid=>$druid}, $c;
17	$s->{_logo} = load_image Gtk::Gdk::ImlibImage('images/logo-simple.xpm');	18	$s->{_logo} = load_image Gtk::Gdk::ImlibImage($images_dir.'logo-simple.xpm');
18		19
19	my $start = Gnome::DruidPageStart->new();	20	my $start = Gnome::DruidPageStart->new();
20	$start->set_title("Syndigator ".$importer->name()." importer: ");	21	$start->set_title("Syndigator ".$importer->name()." importer: ");

Lines 22-27 Link Here

(-)syndigator-0.11.orig/lib/RSSReader/GtkUI/MainWindow.pm (-5 / +6 lines)
22	use base qw(RSSReader::Logger RSSReader::GtkUI);	22	use base qw(RSSReader::Logger RSSReader::GtkUI);
23		23
24	our $_main_window;	24	our $_main_window;
		25	my $images_dir = '/usr/share/syndigator/images/';
25		26
26	sub new {	27	sub new {
27	my $c = shift;	28	my $c = shift;
Lines 89-95 Link Here
89		90
90		91
91	my $style = $window->get_style()->bg( 'normal' );	92	my $style = $window->get_style()->bg( 'normal' );
92	my ( $l_pixmap, $l_mask ) = Gtk::Gdk::Pixmap->create_from_xpm( $window->window, $style, "./images/logo-simple.xpm" );	93	my ( $l_pixmap, $l_mask ) = Gtk::Gdk::Pixmap->create_from_xpm( $window->window, $style, $images_dir.'logo-simple.xpm' );
93	$window->window->set_icon($window->window, $l_pixmap, $l_mask);	94	$window->window->set_icon($window->window, $l_pixmap, $l_mask);
94		95
95		96
Lines 248-255 Link Here
248	$s->{_online_button}->set_relief('none');	249	$s->{_online_button}->set_relief('none');
249	$s->{_online_button}->show;	250	$s->{_online_button}->show;
250	$s->{_status_hbox}->pack_end($s->{_online_button},0,0,0);	251	$s->{_status_hbox}->pack_end($s->{_online_button},0,0,0);
251	$s->{online_pix} = Gnome::Pixmap->new_from_file('images/online.png');	252	$s->{online_pix} = Gnome::Pixmap->new_from_file($images_dir.'online.png');
252	$s->{offline_pix} = Gnome::Pixmap->new_from_file('images/offline.png');	253	$s->{offline_pix} = Gnome::Pixmap->new_from_file($images_dir.'offline.png');
253	$s->{online_pix}->show();	254	$s->{online_pix}->show();
254	$s->{offline_pix}->show();	255	$s->{offline_pix}->show();
255	$s->{_online_button_tooltips} = new Gtk::Tooltips();	256	$s->{_online_button_tooltips} = new Gtk::Tooltips();
Lines 338-344 Link Here
338	my @importers = RSSReader::Importer->get_importers();	339	my @importers = RSSReader::Importer->get_importers();
339	foreach my $importer (@importers) {	340	foreach my $importer (@importers) {
340	my $imp_item = Gnome::Stock->menu_item( "Add", $importer->name() );	341	my $imp_item = Gnome::Stock->menu_item( "Add", $importer->name() );
341	$imp_item->signal_connect( 'activate', sub{ RSSReader::GtkUI::ImporterDruid->run($importer) } );	342	$imp_item->signal_connect( 'activate', sub{ RSSReader::GtkUI::ImporterDruid->run($importer, $images_dir) } );
342	$import_menu->append($imp_item);	343	$import_menu->append($imp_item);
343	}	344	}
344	$import_item->set_submenu($import_menu);	345	$import_item->set_submenu($import_menu);
Lines 400-406 Link Here
400	my $help_menu = new Gtk::MenuItem("Help");	401	my $help_menu = new Gtk::MenuItem("Help");
401	my $help_submenu = new Gtk::Menu;	402	my $help_submenu = new Gtk::Menu;
402	my $about_item = Gnome::Stock->menu_item( "Menu_About", 'About' );	403	my $about_item = Gnome::Stock->menu_item( "Menu_About", 'About' );
403	$about_item->signal_connect('activate', sub {Gnome::About->new('Syndigator', $VERSION, undef, ['Bruno Tavares', 'Paulo Anes'],'http://syndigator.sf.net', 'images/logo-124x22.xpm')->show()} );	404	$about_item->signal_connect('activate', sub {Gnome::About->new('Syndigator', $VERSION, undef, ['Bruno Tavares', 'Paulo Anes'],'http://syndigator.sf.net', $images_dir.'logo-124x22.xpm')->show()} );
404	$about_item->show();	405	$about_item->show();
405	$help_submenu->append($about_item);	406	$help_submenu->append($about_item);
406	$help_menu->set_submenu($help_submenu);	407	$help_menu->set_submenu($help_submenu);