Compare commits
11 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
e309ad14db | ||
|
|
6146e45c4a | ||
|
308ceebd1c | ||
|
df4e941e5f | ||
|
|
c06744a1c0 | ||
|
42e902969c | ||
|
9798b3eacf | ||
|
|
2fd6174d23 | ||
|
76a8aac155 | ||
|
|
9e0c08a1bb | ||
|
|
036ec5b212 |
8 changed files with 1 additions and 557 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -1 +0,0 @@
|
|||
wp_tray-0.5.3.tar.gz
|
||||
1
dead.package
Normal file
1
dead.package
Normal file
|
|
@ -0,0 +1 @@
|
|||
Package is retired
|
||||
1
sources
1
sources
|
|
@ -1 +0,0 @@
|
|||
27b878b8d3864787388b49e934c1ee60 wp_tray-0.5.3.tar.gz
|
||||
|
|
@ -1,24 +0,0 @@
|
|||
diff -ru wp_tray-0.5.3.orig/src/SearchDialog.cc wp_tray-0.5.3/src/SearchDialog.cc
|
||||
--- wp_tray-0.5.3.orig/src/SearchDialog.cc 2007-08-21 15:18:43.000000000 +0100
|
||||
+++ wp_tray-0.5.3/src/SearchDialog.cc 2007-08-21 15:40:05.000000000 +0100
|
||||
@@ -319,7 +319,7 @@
|
||||
{
|
||||
if(boost::regex_match(itDir->leaf(), _refRegex))
|
||||
{
|
||||
- _reflsResults.push_back((*itDir).native_directory_string());
|
||||
+ _reflsResults.push_back((*itDir).path().native_directory_string());
|
||||
}// end if
|
||||
}// end else
|
||||
}// end try
|
||||
diff -ru wp_tray-0.5.3.orig/src/Wallpapers.cc wp_tray-0.5.3/src/Wallpapers.cc
|
||||
--- wp_tray-0.5.3.orig/src/Wallpapers.cc 2007-08-21 15:18:43.000000000 +0100
|
||||
+++ wp_tray-0.5.3/src/Wallpapers.cc 2007-08-21 15:41:56.000000000 +0100
|
||||
@@ -383,7 +383,7 @@
|
||||
{
|
||||
if(-- _nFileIndex == 0)
|
||||
{
|
||||
- _szFile = (*it).native_directory_string();
|
||||
+ _szFile = (*it).path().native_directory_string();
|
||||
}// end if
|
||||
}// end if
|
||||
}// end else
|
||||
|
|
@ -1,188 +0,0 @@
|
|||
--- wp_tray-0.5.3/src/PreferencesDialog.cc~ 2006-11-15 01:43:23.000000000 +0100
|
||||
+++ wp_tray-0.5.3/src/PreferencesDialog.cc 2007-05-09 23:52:17.000000000 +0200
|
||||
@@ -47,6 +47,7 @@
|
||||
m_pCheckButtonLogonNew(NULL),
|
||||
m_pCheckButtonImageCheck(NULL),
|
||||
- m_pCheckButtonFollowLinks(NULL)
|
||||
+ m_pCheckButtonFollowLinks(NULL),
|
||||
+ m_pCheckButtonUseStatics(NULL)
|
||||
{
|
||||
// set up the gconf client
|
||||
m_pGconfClient = Gnome::Conf::Client::get_default_client();
|
||||
@@ -83,6 +84,7 @@
|
||||
m_pGlade->get_widget("checkbutton_logon_new", m_pCheckButtonLogonNew);
|
||||
m_pGlade->get_widget("checkbutton_image_check", m_pCheckButtonImageCheck);
|
||||
m_pGlade->get_widget("checkbutton_follow_links", m_pCheckButtonFollowLinks);
|
||||
+ m_pGlade->get_widget("checkbutton_use_statics", m_pCheckButtonUseStatics);
|
||||
|
||||
// grab the tree view
|
||||
m_pGlade->get_widget("treeview_directories", m_pTreeView);
|
||||
@@ -122,6 +124,7 @@
|
||||
m_pCheckButtonLogonNew->set_active(m_bWpLogon);
|
||||
m_pCheckButtonImageCheck->set_active(m_bImgCheck);
|
||||
m_pCheckButtonFollowLinks->set_active(m_bFollowLinks);
|
||||
+ m_pCheckButtonUseStatics->set_active(m_bUseStatics);
|
||||
|
||||
// give the window an icon
|
||||
PreferencesDialog::set_icon_from_file(GNOMEICONDIR"/wp_tray-applet.png");
|
||||
@@ -275,6 +278,7 @@
|
||||
m_bWpLogon = m_pGconfClient->get_bool("/apps/wp_tray/b_wp_logon");
|
||||
m_bImgCheck = m_pGconfClient->get_bool("/apps/wp_tray/b_img_check");
|
||||
m_bFollowLinks = m_pGconfClient->get_bool("/apps/wp_tray/b_follow_links");
|
||||
+ m_bUseStatics = m_pGconfClient->get_bool("/apps/wp_tray/b_use_statics");
|
||||
m_szPictureOptions = m_pGconfClient->get_string("/desktop/gnome/background/picture_options");
|
||||
}// end PreferencesDialog::GetSettingsInGconf
|
||||
|
||||
@@ -305,5 +309,6 @@
|
||||
m_pGconfClient->set("/apps/wp_tray/b_wp_logon", m_pCheckButtonLogonNew->get_active());
|
||||
m_pGconfClient->set("/apps/wp_tray/b_img_check", m_pCheckButtonImageCheck->get_active());
|
||||
m_pGconfClient->set("/apps/wp_tray/b_follow_links", m_pCheckButtonFollowLinks->get_active());
|
||||
+ m_pGconfClient->set("/apps/wp_tray/b_use_statics", m_pCheckButtonUseStatics->get_active());
|
||||
m_pGconfClient->set("/desktop/gnome/background/picture_options", m_pEntryMode->get_text());
|
||||
}// end PreferencesDialog::SetSettingsToGconf
|
||||
diff -r -b -u old/src/PreferencesDialog.hh wp_tray-0.5.3/src/PreferencesDialog.hh
|
||||
--- wp_tray-0.5.3/src/PreferencesDialog.hh~ 2006-11-15 00:40:19.000000000 +0100
|
||||
+++ wp_tray-0.5.3/src/PreferencesDialog.hh 2007-05-09 23:52:17.000000000 +0200
|
||||
@@ -80,6 +80,7 @@
|
||||
Gtk::CheckButton * m_pCheckButtonLogonNew;
|
||||
Gtk::CheckButton * m_pCheckButtonImageCheck;
|
||||
Gtk::CheckButton * m_pCheckButtonFollowLinks;
|
||||
+ Gtk::CheckButton * m_pCheckButtonUseStatics;
|
||||
Gtk::TreeView * m_pTreeView;
|
||||
|
||||
PreferencesDialogModelColumns m_Model;
|
||||
@@ -92,6 +93,7 @@
|
||||
bool m_bWpLogon;
|
||||
bool m_bImgCheck;
|
||||
bool m_bFollowLinks;
|
||||
+ bool m_bUseStatics;
|
||||
Glib::ustring m_szPictureOptions;
|
||||
|
||||
};// end class PreferencesDialog
|
||||
diff -r -b -u old/src/Wallpapers.cc wp_tray-0.5.3/src/Wallpapers.cc
|
||||
--- wp_tray-0.5.3/src/Wallpapers.cc~ 2006-11-15 01:00:38.000000000 +0100
|
||||
+++ wp_tray-0.5.3/src/Wallpapers.cc 2007-05-09 23:52:17.000000000 +0200
|
||||
@@ -101,6 +101,7 @@
|
||||
|
||||
// grab all the directories
|
||||
std::list<Glib::ustring> lsWpDir = m_pGconfClient->get_string_list("/apps/wp_tray/dir_list");
|
||||
+ bool use_statics = m_pGconfClient->get_bool("/apps/wp_tray/b_use_statics");
|
||||
|
||||
for(std::list<Glib::ustring>::iterator it = lsWpDir.begin(); it != lsWpDir.end(); ++ it)
|
||||
{
|
||||
@@ -108,6 +109,7 @@
|
||||
Wallpapers::CountDirectoryEntries(it->c_str(), nFileCount);
|
||||
}// end for
|
||||
|
||||
+ if (use_statics)
|
||||
nStaticCount = Wallpapers::CountStatics();
|
||||
|
||||
if(nFileCount == 0 && nStaticCount == 0)
|
||||
diff -r -b -u old/src/wp_tray_conf.glade wp_tray-0.5.3/src/wp_tray_conf.glade
|
||||
--- wp_tray-0.5.3/src/wp_tray_conf.glade~ 2006-11-12 16:25:35.000000000 +0100
|
||||
+++ wp_tray-0.5.3/src/wp_tray_conf.glade 2007-05-09 23:52:17.000000000 +0200
|
||||
@@ -76,6 +76,7 @@
|
||||
|
||||
<child>
|
||||
<widget class="GtkNotebook" id="notebook1">
|
||||
+ <property name="border_width">4</property>
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="show_tabs">True</property>
|
||||
@@ -102,7 +103,7 @@
|
||||
<property name="can_focus">True</property>
|
||||
<property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
|
||||
<property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
|
||||
- <property name="shadow_type">GTK_SHADOW_NONE</property>
|
||||
+ <property name="shadow_type">GTK_SHADOW_IN</property>
|
||||
<property name="window_placement">GTK_CORNER_TOP_LEFT</property>
|
||||
|
||||
<child>
|
||||
@@ -374,7 +375,7 @@
|
||||
<child>
|
||||
<widget class="GtkLabel" id="label4">
|
||||
<property name="visible">True</property>
|
||||
- <property name="label" translatable="yes">_Picture Selection Mode:</property>
|
||||
+ <property name="label" translatable="yes">Picture _Selection Mode:</property>
|
||||
<property name="use_underline">True</property>
|
||||
<property name="use_markup">False</property>
|
||||
<property name="justify">GTK_JUSTIFY_LEFT</property>
|
||||
@@ -552,6 +553,25 @@
|
||||
<property name="fill">False</property>
|
||||
</packing>
|
||||
</child>
|
||||
+
|
||||
+ <child>
|
||||
+ <widget class="GtkCheckButton" id="checkbutton_use_statics">
|
||||
+ <property name="visible">True</property>
|
||||
+ <property name="can_focus">True</property>
|
||||
+ <property name="label" translatable="yes">A_dd GNOME Wallpapers to the List</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>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="padding">0</property>
|
||||
diff -r -b -u old/src/wp_tray_search.glade wp_tray-0.5.3/src/wp_tray_search.glade
|
||||
--- wp_tray-0.5.3/src/wp_tray_search.glade~ 2006-11-12 16:31:32.000000000 +0100
|
||||
+++ wp_tray-0.5.3/src/wp_tray_search.glade 2007-05-09 23:52:17.000000000 +0200
|
||||
@@ -10,7 +10,7 @@
|
||||
<property name="type">GTK_WINDOW_TOPLEVEL</property>
|
||||
<property name="window_position">GTK_WIN_POS_CENTER</property>
|
||||
<property name="modal">False</property>
|
||||
- <property name="resizable">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>
|
||||
@@ -193,7 +193,7 @@
|
||||
<property name="can_focus">True</property>
|
||||
<property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
|
||||
<property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
|
||||
- <property name="shadow_type">GTK_SHADOW_NONE</property>
|
||||
+ <property name="shadow_type">GTK_SHADOW_IN</property>
|
||||
<property name="window_placement">GTK_CORNER_TOP_LEFT</property>
|
||||
|
||||
<child>
|
||||
@@ -270,7 +270,7 @@
|
||||
<widget class="GtkRadioButton" id="radiobutton_delete">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
- <property name="label" translatable="yes">Deleted selected wallpapers.</property>
|
||||
+ <property name="label" translatable="yes">Delete selected wallpapers.</property>
|
||||
<property name="use_underline">True</property>
|
||||
<property name="relief">GTK_RELIEF_NORMAL</property>
|
||||
<property name="focus_on_click">True</property>
|
||||
diff -r -b -u old/wp_tray.schemas wp_tray-0.5.3/wp_tray.schemas
|
||||
--- wp_tray-0.5.3/wp_tray.schemas~ 2006-10-25 22:50:08.000000000 +0200
|
||||
+++ wp_tray-0.5.3/wp_tray.schemas 2007-05-09 23:52:17.000000000 +0200
|
||||
@@ -14,6 +14,19 @@
|
||||
</locale>
|
||||
</schema>
|
||||
<schema>
|
||||
+ <key>/schemas/apps/wp_tray/b_use_statics</key>
|
||||
+ <applyto>/apps/wp_tray/b_use_statics</applyto>
|
||||
+ <owner>wp_tray</owner>
|
||||
+ <type>bool</type>
|
||||
+ <default>false</default>
|
||||
+ <locale name="C">
|
||||
+ <short>Use Gnome Wallpapers</short>
|
||||
+ <long>
|
||||
+ Whether or not to add the standard Gnome wallpapers to the list.
|
||||
+ </long>
|
||||
+ </locale>
|
||||
+ </schema>
|
||||
+ <schema>
|
||||
<key>/schemas/apps/wp_tray/b_img_check</key>
|
||||
<applyto>/apps/wp_tray/b_img_check</applyto>
|
||||
<owner>wp_tray</owner>
|
||||
|
|
@ -1,37 +0,0 @@
|
|||
--- wp_tray-0.5.3/src/Wallpapers.cc.orig 2007-12-13 22:11:27.000000000 +0100
|
||||
+++ wp_tray-0.5.3/src/Wallpapers.cc 2007-12-13 22:10:41.000000000 +0100
|
||||
@@ -294,6 +294,7 @@
|
||||
{
|
||||
fs::directory_iterator itEnd;
|
||||
|
||||
+ try {
|
||||
for(fs::directory_iterator it(_pathCurrent); it != itEnd; ++ it)
|
||||
{
|
||||
try
|
||||
@@ -328,7 +329,8 @@
|
||||
std::cerr << "Wallpapers::CountEntriesInDirectory() : " << ex.what() << std::endl;
|
||||
}// end catch
|
||||
}// end for
|
||||
-
|
||||
+ } catch (std::exception& e) {
|
||||
+ }
|
||||
return _nFileCount;
|
||||
}// end Wallpapers::CountDirectoryEntries
|
||||
|
||||
@@ -357,6 +359,7 @@
|
||||
return;
|
||||
}// end if
|
||||
|
||||
+ try {
|
||||
for(fs::directory_iterator it(_pathCurrent); it != itEnd && _nFileIndex != 0; ++ it)
|
||||
{
|
||||
try
|
||||
@@ -393,6 +396,8 @@
|
||||
std::cerr << "Wallpapers::GetDirectoryEntryAtIndex() : " << it->leaf() << " " << ex.what() << std::endl;
|
||||
}// end catch
|
||||
}// end for
|
||||
+ } catch (std::exception& e) {
|
||||
+ }
|
||||
}// end Wallpapers::GetDirectoryEntryAtIndex
|
||||
|
||||
//------------------------------------------------------------------------
|
||||
|
|
@ -1,197 +0,0 @@
|
|||
--- wp_tray-0.5.3/src/PreferencesDialog.cc~ 2007-05-09 23:57:01.000000000 +0200
|
||||
+++ wp_tray-0.5.3/src/PreferencesDialog.cc 2007-05-09 23:39:35.000000000 +0200
|
||||
@@ -47,7 +47,8 @@
|
||||
m_pCheckButtonLogonNew(NULL),
|
||||
m_pCheckButtonImageCheck(NULL),
|
||||
m_pCheckButtonFollowLinks(NULL),
|
||||
- m_pCheckButtonUseStatics(NULL)
|
||||
+ m_pCheckButtonUseStatics(NULL),
|
||||
+ m_pCheckButtonNotifyChange(NULL)
|
||||
{
|
||||
// set up the gconf client
|
||||
m_pGconfClient = Gnome::Conf::Client::get_default_client();
|
||||
@@ -85,6 +86,7 @@
|
||||
m_pGlade->get_widget("checkbutton_image_check", m_pCheckButtonImageCheck);
|
||||
m_pGlade->get_widget("checkbutton_follow_links", m_pCheckButtonFollowLinks);
|
||||
m_pGlade->get_widget("checkbutton_use_statics", m_pCheckButtonUseStatics);
|
||||
+ m_pGlade->get_widget("checkbutton_notify_change", m_pCheckButtonNotifyChange);
|
||||
|
||||
// grab the tree view
|
||||
m_pGlade->get_widget("treeview_directories", m_pTreeView);
|
||||
@@ -125,6 +127,7 @@
|
||||
m_pCheckButtonImageCheck->set_active(m_bImgCheck);
|
||||
m_pCheckButtonFollowLinks->set_active(m_bFollowLinks);
|
||||
m_pCheckButtonUseStatics->set_active(m_bUseStatics);
|
||||
+ m_pCheckButtonNotifyChange->set_active(m_bNotifyChange);
|
||||
|
||||
// give the window an icon
|
||||
PreferencesDialog::set_icon_from_file(GNOMEICONDIR"/wp_tray-applet.png");
|
||||
@@ -279,6 +282,7 @@
|
||||
m_bImgCheck = m_pGconfClient->get_bool("/apps/wp_tray/b_img_check");
|
||||
m_bFollowLinks = m_pGconfClient->get_bool("/apps/wp_tray/b_follow_links");
|
||||
m_bUseStatics = m_pGconfClient->get_bool("/apps/wp_tray/b_use_statics");
|
||||
+ m_bNotifyChange = m_pGconfClient->get_bool("/apps/wp_tray/b_notify_change");
|
||||
m_szPictureOptions = m_pGconfClient->get_string("/desktop/gnome/background/picture_options");
|
||||
}// end PreferencesDialog::GetSettingsInGconf
|
||||
|
||||
@@ -310,5 +314,6 @@
|
||||
m_pGconfClient->set("/apps/wp_tray/b_img_check", m_pCheckButtonImageCheck->get_active());
|
||||
m_pGconfClient->set("/apps/wp_tray/b_follow_links", m_pCheckButtonFollowLinks->get_active());
|
||||
m_pGconfClient->set("/apps/wp_tray/b_use_statics", m_pCheckButtonUseStatics->get_active());
|
||||
+ m_pGconfClient->set("/apps/wp_tray/b_notify_change", m_pCheckButtonNotifyChange->get_active());
|
||||
m_pGconfClient->set("/desktop/gnome/background/picture_options", m_pEntryMode->get_text());
|
||||
}// end PreferencesDialog::SetSettingsToGconf
|
||||
--- wp_tray-0.5.3/src/PreferencesDialog.hh~ 2007-05-10 00:11:44.000000000 +0200
|
||||
+++ wp_tray-0.5.3/src/PreferencesDialog.hh 2007-05-10 00:12:42.000000000 +0200
|
||||
@@ -81,6 +81,7 @@
|
||||
Gtk::CheckButton * m_pCheckButtonImageCheck;
|
||||
Gtk::CheckButton * m_pCheckButtonFollowLinks;
|
||||
Gtk::CheckButton * m_pCheckButtonUseStatics;
|
||||
+ Gtk::CheckButton * m_pCheckButtonNotifyChange;
|
||||
Gtk::TreeView * m_pTreeView;
|
||||
|
||||
PreferencesDialogModelColumns m_Model;
|
||||
@@ -94,6 +95,7 @@
|
||||
bool m_bImgCheck;
|
||||
bool m_bFollowLinks;
|
||||
bool m_bUseStatics;
|
||||
+ bool m_bNotifyChange;
|
||||
Glib::ustring m_szPictureOptions;
|
||||
|
||||
};// end class PreferencesDialog
|
||||
diff -b -u -r old/src/Wallpapers.cc new/src/Wallpapers.cc
|
||||
--- wp_tray-0.5.3/src/Wallpapers.cc~ 2007-05-09 23:57:01.000000000 +0200
|
||||
+++ wp_tray-0.5.3/src/Wallpapers.cc 2007-05-09 23:41:19.000000000 +0200
|
||||
@@ -133,12 +133,13 @@
|
||||
m_szFile = Wallpapers::GetStaticAtIndex(nRandomIndex % nStaticCount);
|
||||
}// end else
|
||||
|
||||
+ bool notify_change = m_pGconfClient->get_bool("/apps/wp_tray/b_notify_change");
|
||||
// set new in gconf
|
||||
if(m_szFile.length() > 0)
|
||||
{
|
||||
m_pApplet->RenderThumbnail(m_szFile);
|
||||
|
||||
- if(_bImediate == true)
|
||||
+ if(_bImediate == true || notify_change == false)
|
||||
{
|
||||
m_pGconfClient->set("/desktop/gnome/background/picture_filename", m_szFile);
|
||||
|
||||
diff -b -u -r old/src/wp_tray_conf.glade new/src/wp_tray_conf.glade
|
||||
--- wp_tray-0.5.3/src/wp_tray_conf.glade~ 2007-05-09 23:57:01.000000000 +0200
|
||||
+++ wp_tray-0.5.3/src/wp_tray_conf.glade 2007-05-09 23:46:07.000000000 +0200
|
||||
@@ -216,7 +216,7 @@
|
||||
<child>
|
||||
<widget class="GtkLabel" id="time_label">
|
||||
<property name="visible">True</property>
|
||||
- <property name="label" translatable="yes">_Rotate Interval (minutes):</property>
|
||||
+ <property name="label" translatable="yes">Rotate Interval (minutes):</property>
|
||||
<property name="use_underline">True</property>
|
||||
<property name="use_markup">False</property>
|
||||
<property name="justify">GTK_JUSTIFY_LEFT</property>
|
||||
@@ -275,7 +275,7 @@
|
||||
<child>
|
||||
<widget class="GtkLabel" id="label3">
|
||||
<property name="visible">True</property>
|
||||
- <property name="label" translatable="yes">_Picture options:</property>
|
||||
+ <property name="label" translatable="yes">Picture options:</property>
|
||||
<property name="use_underline">True</property>
|
||||
<property name="use_markup">False</property>
|
||||
<property name="justify">GTK_JUSTIFY_LEFT</property>
|
||||
@@ -375,7 +375,7 @@
|
||||
<child>
|
||||
<widget class="GtkLabel" id="label4">
|
||||
<property name="visible">True</property>
|
||||
- <property name="label" translatable="yes">Picture _Selection Mode:</property>
|
||||
+ <property name="label" translatable="yes">Picture Selection Mode:</property>
|
||||
<property name="use_underline">True</property>
|
||||
<property name="use_markup">False</property>
|
||||
<property name="justify">GTK_JUSTIFY_LEFT</property>
|
||||
@@ -476,7 +476,7 @@
|
||||
<property name="border_width">10</property>
|
||||
<property name="visible">True</property>
|
||||
<property name="homogeneous">False</property>
|
||||
- <property name="spacing">12</property>
|
||||
+ <property name="spacing">8</property>
|
||||
|
||||
<child>
|
||||
<widget class="GtkCheckButton" id="checkbutton_timeout">
|
||||
@@ -520,7 +520,7 @@
|
||||
<widget class="GtkCheckButton" id="checkbutton_image_check">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
- <property name="label" translatable="yes">_Check Files are Images</property>
|
||||
+ <property name="label" translatable="yes">Check Files are _Images</property>
|
||||
<property name="use_underline">True</property>
|
||||
<property name="relief">GTK_RELIEF_NORMAL</property>
|
||||
<property name="focus_on_click">True</property>
|
||||
@@ -572,6 +572,25 @@
|
||||
<property name="fill">False</property>
|
||||
</packing>
|
||||
</child>
|
||||
+
|
||||
+ <child>
|
||||
+ <widget class="GtkCheckButton" id="checkbutton_notify_change">
|
||||
+ <property name="visible">True</property>
|
||||
+ <property name="can_focus">True</property>
|
||||
+ <property name="label" translatable="yes">Notify on _Wallpaper Change</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>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="padding">0</property>
|
||||
diff -b -u -r old/src/wp_tray_search.glade new/src/wp_tray_search.glade
|
||||
--- wp_tray-0.5.3/src/wp_tray_search.glade~ 2007-05-09 23:57:01.000000000 +0200
|
||||
+++ wp_tray-0.5.3/src/wp_tray_search.glade 2007-05-09 23:50:45.000000000 +0200
|
||||
@@ -33,7 +33,7 @@
|
||||
<property name="title" translatable="yes">Wallpaper Tray Search</property>
|
||||
<property name="text" translatable="yes">Enter some text to search for, any wallpapers in your collection with file names similar to your search text will be listed.
|
||||
|
||||
-Regular expressions are supported.</property>
|
||||
+Regular expressions are supported. Leave search box empty to list all available wallpapers.</property>
|
||||
</widget>
|
||||
</child>
|
||||
|
||||
@@ -182,7 +182,7 @@
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="padding">0</property>
|
||||
- <property name="expand">True</property>
|
||||
+ <property name="expand">False</property>
|
||||
<property name="fill">True</property>
|
||||
</packing>
|
||||
</child>
|
||||
diff -b -u -r old/wp_tray.schemas new/wp_tray.schemas
|
||||
--- wp_tray-0.5.3/wp_tray.schemas~ 2007-05-09 23:57:01.000000000 +0200
|
||||
+++ wp_tray-0.5.3/wp_tray.schemas 2007-05-09 23:42:22.000000000 +0200
|
||||
@@ -27,6 +27,19 @@
|
||||
</locale>
|
||||
</schema>
|
||||
<schema>
|
||||
+ <key>/schemas/apps/wp_tray/b_notify_change</key>
|
||||
+ <applyto>/apps/wp_tray/b_notify_change</applyto>
|
||||
+ <owner>wp_tray</owner>
|
||||
+ <type>bool</type>
|
||||
+ <default>true</default>
|
||||
+ <locale name="C">
|
||||
+ <short>Notify user on change</short>
|
||||
+ <long>
|
||||
+ Whether or not to notify the user when the wallpaper is about to change.
|
||||
+ </long>
|
||||
+ </locale>
|
||||
+ </schema>
|
||||
+ <schema>
|
||||
<key>/schemas/apps/wp_tray/b_img_check</key>
|
||||
<applyto>/apps/wp_tray/b_img_check</applyto>
|
||||
<owner>wp_tray</owner>
|
||||
109
wp_tray.spec
109
wp_tray.spec
|
|
@ -1,109 +0,0 @@
|
|||
Name: wp_tray
|
||||
Version: 0.5.3
|
||||
Release: 7%{?dist}
|
||||
Summary: A wallpaper-changing applet for GNOME
|
||||
|
||||
Group: Amusements/Graphics
|
||||
License: GPLv2
|
||||
URL: http://planetearthworm.com/projects/wp_tray/
|
||||
Source0: http://planetearthworm.com/projects/wp_tray/files/%{name}-%{version}.tar.gz
|
||||
Patch0: wp_tray-0.5.3-gnomewp.patch
|
||||
Patch1: wp_tray-0.5.3-notify.patch
|
||||
Patch2: wp_tray-0.5.3-boost.patch
|
||||
Patch3: wp_tray-0.5.3-missingdir.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
|
||||
BuildRequires: gettext libglademm24-devel libgnomecanvasmm26-devel
|
||||
BuildRequires: gconfmm26-devel libgnomemm26-devel libgnomeuimm26-devel
|
||||
BuildRequires: gnome-panel-devel boost-devel
|
||||
BuildRequires: libxml++-devel libnotify-devel
|
||||
|
||||
%description
|
||||
Wallpaper Tray is a GNOME applet used for changing your wallpaper.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1 -b .gnomewp
|
||||
%patch1 -p1 -b .notify
|
||||
%patch2 -p1 -b .boost
|
||||
%patch3 -p1 -b .missingdir
|
||||
|
||||
%build
|
||||
%configure --with-boostfilesystem=%{_libdir}/libboost_filesystem.so \
|
||||
--with-boostregex=%{_libdir}/libboost_regex.so
|
||||
make %{?_smp_mflags}
|
||||
|
||||
%install
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
|
||||
make install DESTDIR=$RPM_BUILD_ROOT
|
||||
%find_lang %{name}
|
||||
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%post
|
||||
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
|
||||
gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/wp_tray.schemas > /dev/null || :
|
||||
killall -HUP gconfd-2 &>/dev/null || :
|
||||
|
||||
%postun
|
||||
if [ "$1" -gt 1 ]; then
|
||||
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
|
||||
gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/wp_tray.schemas >/dev/null || :
|
||||
killall -HUP gconfd-2 &>/dev/null || :
|
||||
fi
|
||||
|
||||
%preun
|
||||
if [ "$1" -eq 0 ]; then
|
||||
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
|
||||
gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/wp_tray.schemas > /dev/null || :
|
||||
killall -HUP gconfd-2 &>/dev/null || :
|
||||
fi
|
||||
|
||||
%files -f %{name}.lang
|
||||
%defattr(-,root,root,-)
|
||||
%doc AUTHORS ChangeLog COPYING NEWS README
|
||||
%{_datadir}/%{name}
|
||||
%{_datadir}/pixmaps/*
|
||||
%{_libdir}/bonobo/servers/*.server
|
||||
%{_libexecdir}/*
|
||||
%{_sysconfdir}/gconf/schemas/*.schemas
|
||||
|
||||
%changelog
|
||||
* Mon Feb 18 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 0.5.3-7
|
||||
- Autorebuild for GCC 4.3
|
||||
|
||||
* Thu Dec 13 2007 Denis Leroy <denis@poolshark.org> - 0.5.3-6
|
||||
- Added patch to fix missing dir crash
|
||||
|
||||
* Fri Aug 3 2007 Denis Leroy <denis@poolshark.org> - 0.5.3-5
|
||||
- Changed License field to new guidelines
|
||||
- Added patch to support new boost library
|
||||
|
||||
* Wed May 9 2007 Denis Leroy <denis@poolshark.org> - 0.5.3-4
|
||||
- Added patch to make change lib-notifications optional
|
||||
- Cleaned up gnomewp patch
|
||||
|
||||
* Tue May 8 2007 Denis Leroy <denis@poolshark.org> - 0.5.3-3
|
||||
- Added patch to make gnome wp addition optional, minor glade fixes
|
||||
|
||||
* Fri Dec 8 2006 Denis Leroy <denis@poolshark.org> - 0.5.3
|
||||
- Update to 0.5.3, patches integrated upstream
|
||||
- Added libxml++ and libnotify dependencies
|
||||
|
||||
* Mon Sep 11 2006 Denis Leroy <denis@poolshark.org> - 0.5.1-4
|
||||
- Added patches to fix many bugs (see bug 205869)
|
||||
|
||||
* Sun Sep 3 2006 Denis Leroy <denis@poolshark.org> - 0.5.1-3
|
||||
- FE6 Rebuild
|
||||
|
||||
* Mon Feb 13 2006 Ignacio Vazquez-Abrams <ivazquez@ivazquez.net> 0.5.1-2
|
||||
- Rebuild for Fedora Extras 5
|
||||
|
||||
* Tue Jan 17 2006 Ignacio Vazquez-Abrams <ivazquez@ivazquez.net> 0.5.1-1
|
||||
- Upstream update
|
||||
- Merge Chris Chabot's spec file changes
|
||||
|
||||
* Mon Jan 2 2006 Ignacio Vazquez-Abrams <ivazquez@ivazquez.net> 0.4.6-1
|
||||
- Initial RPM release
|
||||
Loading…
Add table
Add a link
Reference in a new issue