rpms/dekorator/FC-6 dekorator-0.3-config_help_tab.patch, NONE, 1.1 dekorator-0.3-default_theme.patch, NONE, 1.1 dekorator-0.3-remove_theme_paths_button.patch, NONE, 1.1 dekorator.spec, NONE, 1.1 sources, 1.1, 1.2

Francois Aucamp (faucamp) fedora-extras-commits at redhat.com
Thu Mar 1 07:48:32 UTC 2007 

Author: faucamp

Update of /cvs/extras/rpms/dekorator/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv856

Modified Files:
	sources 
Added Files:
	dekorator-0.3-config_help_tab.patch 
	dekorator-0.3-default_theme.patch 
	dekorator-0.3-remove_theme_paths_button.patch dekorator.spec 
Log Message:
Initial import of dekorator into branch FC-6


dekorator-0.3-config_help_tab.patch:

--- NEW FILE dekorator-0.3-config_help_tab.patch ---
diff -uNr dekorator-0.3/client/config/configdialog.ui dekorator-0.3-mod/client/config/configdialog.ui
--- dekorator-0.3/client/config/configdialog.ui	2007-02-21 15:52:54.000000000 +0200
+++ dekorator-0.3-mod/client/config/configdialog.ui	2007-02-21 15:30:16.000000000 +0200
@@ -1881,7 +1881,7 @@
 All images should be in PNG.
 
 ****** Tips and Tricks ******
-Allways start up building your theme from the template-theme.
+Always start up building your theme from the template-theme.
 </string>
                         </property>
                         <property name="wordWrap">
@@ -1977,7 +1977,7 @@
                             <cstring>kActiveLabel4</cstring>
                         </property>
                         <property name="text">
-                            <string><p align="center"><h3>deKorator Window's Decoration Version 0.3</h3></p><br>
+                            <string><p align="center"><h3>deKorator Window Decoration Version 0.3</h3></p><br>



diff -uNr dekorator-0.3/client/config/deKoratorconfig.cc dekorator-0.3-mod/client/config/deKoratorconfig.cc
--- dekorator-0.3/client/config/deKoratorconfig.cc	2007-02-21 15:52:54.000000000 +0200
+++ dekorator-0.3-mod/client/config/deKoratorconfig.cc	2007-02-21 15:30:16.000000000 +0200
@@ -31,6 +31,8 @@
 // Boston, MA 02110-1301, USA.
 ///////////////////////////////////////////////////////////////////////
 
+#undef DOC_DIR
+#include <qtextedit.h>
 #include <kconfig.h>
 #include <klocale.h>
 #include <kglobal.h>
@@ -70,6 +72,18 @@
 
     themes_ = new IconThemesConfig( dialog_, dialog_->themesKlstView /*, dialog_->removeThemBtn*/ );
 
+    // faucamp: rather display the "deKhelp.xhtml" help file than static text embedded in the .ui file
+    // - this makes it more dynamic, and looks better
+#ifdef DOC_DIR
+    QFile helpFile( QString(DOC_DIR) + "/deKhelp.xhtml" );
+    if ( helpFile.open( IO_ReadOnly ) )
+    {
+        QTextStream stream( &helpFile );
+        dialog_->textEdit1->setTextFormat(Qt::RichText);
+        dialog_->textEdit1->setText( stream.read() );
+    }
+#endif
+
     dialog_->show();
 
     // load the configuration
diff -uNr dekorator-0.3/themesStuff/deKhelp.xhtml dekorator-0.3-mod/themesStuff/deKhelp.xhtml
--- dekorator-0.3/themesStuff/deKhelp.xhtml	2006-02-20 17:01:17.000000000 +0200
+++ dekorator-0.3-mod/themesStuff/deKhelp.xhtml	2007-02-21 15:55:44.000000000 +0200
@@ -12,6 +12,8 @@
 		<ul>
 			<li><strong>default-theme</strong> - Used by default, illustrates some of deKorator's features.</li>
 			<li><strong>ugly-theme</strong> - It's purpose is to understand the way deKorator paints the decorations.</li>
+			<li><strong>template-theme</strong> - This theme  is meant to be a template theme for other themes; it features all possible buttons.</li>
+			<li><strong>Bushido-Yellow-theme</strong> - This theme shows how masking can be done.</li>
 		</ul>
 		<h1>Names</h1>
 		<p>deKorator expects the same directory structure and file names as the ones in default-theme. Every theme file should end with "-theme" (as in "default-theme"), and should contain all the folders that are in default-theme (deco, buttons, masks).</p>
@@ -102,5 +104,7 @@
 		<p>Masks contain only black and white. Black pixels are subtracted from the decoration.</p>
 		<h1>Image format</h1>
 		<p>All images should be in PNG.</p>
+		<h1>Tips and Tricks</h1>
+		<p>Always start building your theme from the template-theme.</p>
 	</body>
 </html>
\ No newline at end of file

dekorator-0.3-default_theme.patch:

--- NEW FILE dekorator-0.3-default_theme.patch ---
diff -uNr dekorator-0.3/client/config/deKoratorconfig.cc dekorator-0.3-mod/client/config/deKoratorconfig.cc
--- dekorator-0.3/client/config/deKoratorconfig.cc	2007-02-21 11:23:10.000000000 +0200
+++ dekorator-0.3-mod/client/config/deKoratorconfig.cc	2007-02-21 12:10:24.000000000 +0200
@@ -250,11 +250,14 @@
 
     // path's
     config_->setGroup( "PATHS" );
-
-    dialog_->framesPathKurl->setURL( config_->readEntry( "FramesPath", "" ) );
-    dialog_->buttonsPathKurl->setURL( config_->readEntry( "ButtonsPath", "" ) );
-    dialog_->useMasks_Chkbox->setChecked( config_->readBoolEntry( "UseMasks", FALSE ) );
-    dialog_->masksPathKurl->setURL( config_->readEntry( "MasksPath", "" ) );
+    // faucamp: for Fedora's default setting, we select the "Default-theme" if no previous
+    // themes have been selected (we also set "use masks" to TRUE), in order to avoid removing
+    // all window frames if the user clicks on kcontrol's "apply" button before actually selecting
+    // a dekorator theme
+    dialog_->framesPathKurl->setURL( config_->readEntry( "FramesPath", "/usr/share/apps/deKorator/themes/Default-theme/deco" ) );
+    dialog_->buttonsPathKurl->setURL( config_->readEntry( "ButtonsPath", "/usr/share/apps/deKorator/themes/Default-theme/buttons" ) );
+    dialog_->useMasks_Chkbox->setChecked( config_->readBoolEntry( "UseMasks", TRUE ) );
+    dialog_->masksPathKurl->setURL( config_->readEntry( "MasksPath", "/usr/share/apps/deKorator/themes/Default-theme/masks" ) );
 }
 
 //////////////////////////////////////////////////////////////////////////////
@@ -403,10 +406,14 @@
     dialog_->shadeDownClrBtn->setColor( QColor( 150, 150, 150 ) );
 
     // path's
-    dialog_->framesPathKurl->setURL( "" );
-    dialog_->buttonsPathKurl->setURL( "" );
-    dialog_->useMasks_Chkbox->setChecked( config_->readBoolEntry( "UseMasks", FALSE ) );
-    dialog_->masksPathKurl->setURL( "" );
+    // faucamp: for Fedora's default setting, we select the "Default-theme" if no previous
+    // themes have been selected (we also set "use masks" to TRUE), in order to avoid removing
+    // all window frames if the user clicks on kcontrol's "apply" button before actually selecting
+    // a dekorator theme
+    dialog_->framesPathKurl->setURL( "/usr/share/apps/deKorator/themes/Default-theme/deco" );
+    dialog_->buttonsPathKurl->setURL( "/usr/share/apps/deKorator/themes/Default-theme/buttons" );
+    dialog_->useMasks_Chkbox->setChecked( config_->readBoolEntry( "UseMasks", TRUE ) );
+    dialog_->masksPathKurl->setURL( "/usr/share/apps/deKorator/themes/Default-theme/masks" );
 }
 
 //////////////////////////////////////////////////////////////////////////////

dekorator-0.3-remove_theme_paths_button.patch:

--- NEW FILE dekorator-0.3-remove_theme_paths_button.patch ---
diff -uNr dekorator-0.3/client/config/configdialog.ui dekorator-0.3-mod/client/config/configdialog.ui
--- dekorator-0.3/client/config/configdialog.ui	2006-02-20 19:25:43.000000000 +0200
+++ dekorator-0.3-mod/client/config/configdialog.ui	2007-02-21 10:07:03.000000000 +0200
@@ -1755,17 +1755,23 @@
                                     <string>Alt+E</string>
                                 </property>
                             </widget>
-                            <widget class="QPushButton">
+                            <spacer>
                                 <property name="name">
-                                    <cstring>applyThemeBtn</cstring>
+                                    <cstring>applyThemeBtnSpacer</cstring>
                                 </property>
-                                <property name="text">
-                                    <string>Set The&me Paths</string>
+                                <property name="orientation">
+                                    <enum>Horizontal</enum>
                                 </property>
-                                <property name="accel">
-                                    <string>Alt+M</string>
+                                <property name="sizeType">
+                                    <enum>Expanding</enum>
                                 </property>
-                            </widget>
+                                <property name="sizeHint">
+                                    <size>
+                                        <width>121</width>
+                                        <height>20</height>
+                                    </size>
+                                </property>
+                            </spacer>
                         </hbox>
                     </widget>
                 </vbox>
diff -uNr dekorator-0.3/client/config/deKoratorconfig.cc dekorator-0.3-mod/client/config/deKoratorconfig.cc
--- dekorator-0.3/client/config/deKoratorconfig.cc	2006-02-20 16:48:16.000000000 +0200
+++ dekorator-0.3-mod/client/config/deKoratorconfig.cc	2007-02-21 10:06:50.000000000 +0200
@@ -150,8 +150,8 @@
              SLOT( themeSelected( QListViewItem * ) ) );
     connect( dialog_->installthemeBtn, SIGNAL( clicked( ) ), SLOT( installNewTheme() ) );
     connect( dialog_->removeThemBtn, SIGNAL( clicked( ) ), SLOT( removeSelectedTheme() ) );
-    connect( dialog_->applyThemeBtn, SIGNAL( clicked( ) ), SLOT( setTheme() ) );
-
+    // faucamp: removed "set theme button" signal connect; added qlistview connection
+    connect( dialog_->themesKlstView, SIGNAL( selectionChanged() ), SLOT( setTheme() ) );
 }
 
 //////////////////////////////////////////////////////////////////////////////


--- NEW FILE dekorator.spec ---
Name:           dekorator
Version:        0.3
Release:        3%{?dist}
Summary:        KDE window decoration engine

Group:          User Interface/Desktops
License:        GPL
URL:            http://www.kde-look.org/content/show.php?content=31447
Source0:        http://motyr.cheetux.org.il/deKorator/%{version}/SOURCE/%{name}-%{version}.tar.gz
Source1:        dekorator.fedora
# Source2 is a fixed version of the same theme included in Source0
Source2:        Bushido-Yellow-theme.tar.gz
Patch0:         dekorator-0.3-remove_theme_paths_button.patch
Patch1:         dekorator-0.3-default_theme.patch
Patch2:         dekorator-0.3-config_help_tab.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  kdebase-devel
Requires:       kdebase

%description
deKorator is a window decoration engine for KDE.

deKorator takes several user-defined images and presents them as a window
decoration. It loads its images from a user-defined directory (similar to
iceWM), thus everything is themeable in no time and no programming knowledge
is needed.


%prep
%setup -q
%patch0 -p1 -b .remove_theme_paths_button
%patch1 -p1 -b .default_theme
%patch2 -p1 -b .config_help_tab
cp -p %{SOURCE1} .
# Make the configuration dialog use the HTML help supplied with the RPM
sed -i 's:undef DOC_DIR:define DOC_DIR "%{_docdir}/%{name}-%{version}":' \
    client/config/deKoratorconfig.cc


%build
%configure --disable-rpath
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
# Install the default theme
mkdir -p $RPM_BUILD_ROOT%{_datadir}/apps/deKorator/themes
tar -xjf themesStuff/Default-theme.tar.bz2
mv Default-theme $RPM_BUILD_ROOT%{_datadir}/apps/deKorator/themes/
# Install the "template" theme
tar -xzf themesStuff/template-theme.tar.gz
mv template-theme $RPM_BUILD_ROOT%{_datadir}/apps/deKorator/themes/
# Install the "ugly" theme
tar -xzf themesStuff/ugly-theme.tar.gz
mv ugly-theme $RPM_BUILD_ROOT%{_datadir}/apps/deKorator/themes/
# Install the modified "Bushido-Yellow" theme
tar -xzf %{SOURCE2}
mv Bushido-Yellow-theme $RPM_BUILD_ROOT%{_datadir}/apps/deKorator/themes/


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS CHANGELOG README gpl.txt themesStuff/deKhelp.xhtml dekorator.fedora
%{_libdir}/kde3/kwin3_deKorator.so
%{_libdir}/kde3/kwin3_deKorator.la
%{_libdir}/kde3/kwin_deKorator_config.so
%{_libdir}/kde3/kwin_deKorator_config.la
%{_datadir}/apps/kwin/deKorator.desktop
%{_datadir}/apps/deKorator


%changelog
* Wed Feb 21 2007 Francois Aucamp <faucamp at csir.co.za> - 0.3-3
- Added "Requires: kdebase" as this package is useless without kwin
- Install the "ugly" theme (moved it from %%doc)
- Created "remove_theme_paths_button" patch to remove the config dialog's "set theme paths" button
- Created "default_theme" patch to set a first-time default theme
- Fixed the Bushido-Yellow theme's masks to make it usable
- Install the "Bushido-Yellow" theme by default
- Added "dekorator.fedora" to %%doc to explain why some extra themes are modified/omitted
- Created "config_help_tab" patch to make the config dialog use HTML help (and fix some typos)

* Tue Feb 20 2007 Francois Aucamp <faucamp at csir.co.za> - 0.3-2
- Added required libtool archives again

* Tue Feb 20 2007 Francois Aucamp <faucamp at csir.co.za> - 0.3-1
- Initial RPM build


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dekorator/FC-6/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	1 Mar 2007 05:45:49 -0000	1.1
+++ sources	1 Mar 2007 07:47:59 -0000	1.2
@@ -0,0 +1,2 @@
+7b7451ac4b1e58948e662873c36b3421  Bushido-Yellow-theme.tar.gz
+b527b33645a69cba5662b3d7f31f9245  dekorator-0.3.tar.gz

More information about the fedora-extras-commits mailing list