- Update to version 0.5
- Removed "large_cover_images" patch; included upstream - Removed "config_dialog_layout" patch; included upstream - Updated "fedora_paths" patch - Updated "start_amarok" patch - Updated "theme_howto" patch - Updated amarok integration script
This commit is contained in:
Francois Aucamp
parent
92ee1772e0
commit
ca44afb2d6
10 changed files with 129 additions and 276 deletions
|
|
@ -1,57 +0,0 @@
|
|||
diff -uNr amarokFS-qt3-0.4.2/amarokfs_config.cpp amarokFS-qt3-0.4.2-mod/amarokfs_config.cpp
|
||||
--- amarokFS-qt3-0.4.2/amarokfs_config.cpp 2007-02-09 17:25:17.000000000 +0200
|
||||
+++ amarokFS-qt3-0.4.2-mod/amarokfs_config.cpp 2007-02-11 17:12:31.000000000 +0200
|
||||
@@ -48,32 +48,46 @@
|
||||
|
||||
setCaption("amarokFS Config" );
|
||||
|
||||
+ QVBoxLayout *configLayout = new QVBoxLayout( this, 11, 6, "configLayout" );
|
||||
+
|
||||
+ QHBoxLayout *themeLayout = new QHBoxLayout( 0, 0, 6, "themeLayout" );
|
||||
textLabel1 = new QLabel( this, "textLabel1" );
|
||||
textLabel1->setGeometry( QRect( 10, 10, 50, 20 ) );
|
||||
textLabel1->setText( "Theme:" );
|
||||
+ themeLayout->addWidget(textLabel1);
|
||||
kURLRequester1 = new KURLRequester( this, "kURLRequester1" );
|
||||
kURLRequester1->setGeometry( QRect( 60, 0, 311, 41 ) );
|
||||
kURLRequester1->setFilter( "*.xml|xml Theme Files" );
|
||||
-
|
||||
+ themeLayout->addWidget( kURLRequester1 );
|
||||
+ configLayout->addLayout(themeLayout);
|
||||
+
|
||||
disScrSvr = new QCheckBox(this, "disScrSvr");
|
||||
disScrSvr->setText("Disable screen saver");
|
||||
disScrSvr->setGeometry( QRect(10, 40, 250, 20) );
|
||||
-
|
||||
+ configLayout->addWidget( disScrSvr );
|
||||
+
|
||||
textLabel2 = new QLabel( this, "textLabel2" );
|
||||
textLabel2->setGeometry( QRect( 10, 70, 371, 20 ) );
|
||||
textLabel2->setText("New settings will be applied after restarting the application." ) ;
|
||||
-
|
||||
+ configLayout->addWidget( textLabel2 );
|
||||
+
|
||||
+ QHBoxLayout *buttonLayout = new QHBoxLayout( 0, 0, 6, "buttonLayout" );
|
||||
+ QSpacerItem *buttonSpacer = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
|
||||
+ buttonLayout->addItem( buttonSpacer );
|
||||
+
|
||||
+
|
||||
okButton = new QPushButton( this, "ok" );
|
||||
okButton->setGeometry( QRect( 211, 90, 80, 30 ) );
|
||||
okButton->setText( "OK" );
|
||||
+ buttonLayout->addWidget( okButton );
|
||||
|
||||
cancelButton = new QPushButton( this, "cancel" );
|
||||
cancelButton->setGeometry( QRect( 300, 90, 80, 30 ) );
|
||||
cancelButton->setText( "Cancel" );
|
||||
-
|
||||
- resize( QSize(390, 130).expandedTo(minimumSizeHint()) );
|
||||
-
|
||||
-
|
||||
+ buttonLayout->addWidget( cancelButton );
|
||||
+ configLayout->addLayout( buttonLayout );
|
||||
+
|
||||
+
|
||||
kapp->config()->setGroup ("Theme");
|
||||
themeKUrl = kapp->config()->readEntry ("KUrl", "");
|
||||
//cout << themeKUrl << "\n";
|
||||
|
|
@ -1,115 +0,0 @@
|
|||
diff -uNr amarokFS-qt3-0.4.2/amarokFS-xml.pro amarokFS-qt3-0.4.2-mod/amarokFS-xml.pro
|
||||
--- amarokFS-qt3-0.4.2/amarokFS-xml.pro 2007-02-08 01:24:13.000000000 +0200
|
||||
+++ amarokFS-qt3-0.4.2-mod/amarokFS-xml.pro 2007-02-13 15:45:05.000000000 +0200
|
||||
@@ -4,12 +4,7 @@
|
||||
CONFIG += qt warn_on release
|
||||
|
||||
INCLUDEPATH += /usr/include/kde
|
||||
-INCLUDEPATH += /usr/local/include/kde
|
||||
INCLUDEPATH += /usr/include
|
||||
-INCLUDEPATH += /opt/kde3/include
|
||||
-INCLUDEPATH += /opt/kde/include
|
||||
-INCLUDEPATH += /usr/kde/3.5/include
|
||||
-
|
||||
|
||||
HEADERS = amfs-xml.h \
|
||||
cb.h \
|
||||
@@ -23,36 +18,22 @@
|
||||
amarokfs_config.cpp
|
||||
|
||||
LIBS += -lkdecore
|
||||
-LIBS += -L/opt/kde3/lib
|
||||
-LIBS += -L/usr/local/kde3/lib
|
||||
-LIBS += -L/usr/lib/qt3
|
||||
-LIBS += -L/opt/kde/lib
|
||||
-LIBS += -L/usr/kde/3.5/lib
|
||||
+LIBS += -L/usr/lib/kde3
|
||||
LIBS += -lkio
|
||||
|
||||
-images.path = /usr/local/share/amarokFS/images
|
||||
+images.path = /usr/share/amarokFS/images
|
||||
images.files = images/*
|
||||
|
||||
-defaultTheme.path = /usr/local/share/amarokFS
|
||||
+defaultTheme.path = /usr/share/amarokFS
|
||||
defaultTheme.files = theme.xml
|
||||
|
||||
-target.path = /usr/local/bin
|
||||
+target.path = /usr/bin
|
||||
|
||||
icon.files = amarokFS.png
|
||||
-icon.path = /usr/share/icons/
|
||||
-
|
||||
-desktop.files = amarokFS.desktop
|
||||
-desktop.path = /usr/share/applications/
|
||||
+icon.path = /usr/share/icons/hicolor/128x128/apps
|
||||
|
||||
-docs.files = README
|
||||
-docs.files += theme-howto.txt
|
||||
-docs.path = /usr/share/doc/amarokFS
|
||||
-
|
||||
-
|
||||
INSTALLS += target
|
||||
INSTALLS += images
|
||||
-INSTALLS += desktop
|
||||
INSTALLS += icon
|
||||
INSTALLS += defaultTheme
|
||||
-INSTALLS += docs
|
||||
|
||||
diff -uNr amarokFS-qt3-0.4.2/amfs-xml.cpp amarokFS-qt3-0.4.2-mod/amfs-xml.cpp
|
||||
--- amarokFS-qt3-0.4.2/amfs-xml.cpp 2007-02-08 14:56:33.000000000 +0200
|
||||
+++ amarokFS-qt3-0.4.2-mod/amfs-xml.cpp 2007-02-13 09:42:18.000000000 +0200
|
||||
@@ -40,9 +40,9 @@
|
||||
//cout << themeCustomPrepath << "\n";
|
||||
|
||||
//set the default path
|
||||
- QString themePath = "/usr/local/share/amarokFS/theme.xml";
|
||||
+ QString themePath = "/usr/share/amarokFS/theme.xml";
|
||||
//default prepath for the images directory
|
||||
- QString themeImagesPrePath = "/usr/local/share/amarokFS/";
|
||||
+ QString themeImagesPrePath = "/usr/share/amarokFS/";
|
||||
|
||||
//if the custom theme file exists, use it, otherwise use the default theme
|
||||
if(QFile(themeCustomPath).exists()) {
|
||||
@@ -470,7 +470,7 @@
|
||||
reflectionPixmap = cdReflected;
|
||||
|
||||
QImage gradientImage;
|
||||
- gradientImage.load( "/usr/local/share/amarokFS/images/gradient.png");
|
||||
+ gradientImage.load( "/usr/share/amarokFS/images/gradient.png");
|
||||
gradientImage = gradientImage.scale(reflectionPixmap.width(), 120);
|
||||
gradientPixmap = gradientImage;
|
||||
gradient->setPixmap(gradientPixmap);
|
||||
@@ -511,8 +511,8 @@
|
||||
result.load(coverPathDCOPtagcover);
|
||||
}
|
||||
if (result.isNull()) {
|
||||
- if(transDef == TRUE) result.load("/usr/local/share/amarokFS/images/logoB.png");
|
||||
- else result.load("/usr/local/share/amarokFS/images/logo.png");
|
||||
+ if(transDef == TRUE) result.load("/usr/share/amarokFS/images/logoB.png");
|
||||
+ else result.load("/usr/share/amarokFS/images/logo.png");
|
||||
}
|
||||
return result;
|
||||
|
||||
diff -uNr amarokFS-qt3-0.4.2/README amarokFS-qt3-0.4.2-mod/README
|
||||
--- amarokFS-qt3-0.4.2/README 2007-02-08 15:26:37.000000000 +0200
|
||||
+++ amarokFS-qt3-0.4.2-mod/README 2007-02-13 09:43:06.000000000 +0200
|
||||
@@ -10,14 +10,14 @@
|
||||
If the compile proces fails, try running "qmake" first and then "make".
|
||||
For installation run "make install" (requires root priviliges)
|
||||
|
||||
- Executable is installed into /usr/local/bin,
|
||||
- default theme + its images into /usr/local/share/amarokFS,
|
||||
- icon into /usr/share/icons
|
||||
+ Executable is installed into /usr/bin,
|
||||
+ default theme + its images into /usr/share/amarokFS,
|
||||
+ icon into /usr/share/icons/hicolor/128x128/apps
|
||||
and the .desktop file into /usr/share/applications
|
||||
|
||||
THEMES:
|
||||
The theme can be chosen by the button in the upper left corner (which hides automaticaly).
|
||||
- If no theme is selected (or the selected theme is not readable) the default theme is used (/usr/local/share/amarokFS/theme.xml).
|
||||
+ If no theme is selected (or the selected theme is not readable) the default theme is used (/usr/share/amarokFS/theme.xml).
|
||||
|
||||
If you want to write your own skins please read the instructions in theme-howto.txt.
|
||||
|
||||
|
|
@ -1,20 +0,0 @@
|
|||
diff -uNr amarokFS-qt3-0.4.2/amfs-xml.cpp amarokFS-qt3-0.4.2-mod/amfs-xml.cpp
|
||||
--- amarokFS-qt3-0.4.2/amfs-xml.cpp 2007-02-11 17:19:12.000000000 +0200
|
||||
+++ amarokFS-qt3-0.4.2-mod/amfs-xml.cpp 2007-02-11 17:53:23.000000000 +0200
|
||||
@@ -13,6 +13,7 @@
|
||||
#include <stdlib.h>
|
||||
#include <qmessagebox.h>
|
||||
#include <qerrormessage.h>
|
||||
+#include <qregexp.h>
|
||||
|
||||
using namespace std;
|
||||
|
||||
@@ -493,7 +494,7 @@
|
||||
//path from dcop (only 100x100px image)
|
||||
QString coverPathDCOP = getDCOPDataText("coverImage()");
|
||||
//$HOME/.kde/share/apps/amarok/albumcovers/large/.... - some covers are stored here
|
||||
- QString coverPathDCOPlarge = coverPathDCOP.replace("cache/100@", "large/");
|
||||
+ QString coverPathDCOPlarge = coverPathDCOP.replace(QRegExp("cache/[\\d]+@"), "large/");
|
||||
//$HOME/.kde/share/apps/amarok/albumcovers/tagcover/.... - and some are stored here
|
||||
QString coverPathDCOPtagcover = coverPathDCOP.replace("large/", "tagcover/");
|
||||
|
||||
|
|
@ -1,24 +0,0 @@
|
|||
diff -uNr amarokFS-qt3-0.4.2/theme-howto.txt amarokFS-qt3-0.4.2-mod/theme-howto.txt
|
||||
--- amarokFS-qt3-0.4.2/theme-howto.txt 2007-02-11 18:57:38.000000000 +0200
|
||||
+++ amarokFS-qt3-0.4.2-mod/theme-howto.txt 2007-02-11 18:58:09.000000000 +0200
|
||||
@@ -20,7 +20,7 @@
|
||||
d) "clicked" defines the path to the image to be displayed you press the button
|
||||
e) "command" defines the dcop-function to be called. To see available functions run "kdcop", open amarok/player. Only function without any arguments can be called.
|
||||
|
||||
-3) The "trackLabel" Element defines a text-label. Its contet changes with every track change. It has folowing subelements:
|
||||
+3) The "labelTrack" Element defines a text-label. Its contet changes with every track change. It has folowing subelements:
|
||||
a) "x" and "y" define the position
|
||||
b) "w" and "h" define width and height
|
||||
c) "command" defines the dcop-function to be called to get the text value. To see available functions run "kdcop", open amarok/player. Only function without any arguments and returning a QString can be called.
|
||||
@@ -30,9 +30,9 @@
|
||||
g) "align" defines horizontal alignment, values are: 0 for auto, 1 for left, 2 for right, 4 for center and 5 for justify;
|
||||
h) "valign" defines vertical alignment, values are: 16 for top, 32 for bottom, 64 for center
|
||||
|
||||
-4) The "trackInstant" Element defines a text-label similar to trackLabel. The only difference is that it changes every second. It has the same subelements as "trackLabel".
|
||||
+4) The "labelInstant" Element defines a text-label similar to trackLabel. The only difference is that it changes every second. It has the same subelements as "labelTrack".
|
||||
|
||||
-5) The "trackStatic" Element defines a text-label similar to trackLabel. The only difference is that it never changes. It has the same subelements as "trackLabel" except:
|
||||
+5) The "labelStatic" Element defines a text-label similar to trackLabel. The only difference is that it never changes. It has the same subelements as "labelTrack" except:
|
||||
a) "text" determines the content (and "command" is ignored)
|
||||
|
||||
4) The "progressbar" element - only one can be used, subelements:
|
||||
|
|
@ -1,19 +0,0 @@
|
|||
diff -uNr amarokFS-qt3-0.4.2/theme.xml amarokFS-qt3-0.4.2-mod/theme.xml
|
||||
--- amarokFS-qt3-0.4.2/theme.xml 2007-02-08 00:09:48.000000000 +0200
|
||||
+++ amarokFS-qt3-0.4.2-mod/theme.xml 2007-02-19 18:12:22.000000000 +0200
|
||||
@@ -1,7 +1,7 @@
|
||||
<amarokFS themeWidth="800" themeHeight="600" bgcolorR="0" bgcolorG="0" bgcolorB="0">
|
||||
<button>
|
||||
<path>images/player_start.png</path>
|
||||
- <clicked>images/player_start.png</clicked>
|
||||
+ <clicked>images/player_start2.png</clicked>
|
||||
<command>prev()</command>
|
||||
<x>450</x>
|
||||
<y>550</y>
|
||||
@@ -135,4 +135,4 @@
|
||||
<x>450</x>
|
||||
<y>353</y>
|
||||
</reflection>
|
||||
-</amarokFS>
|
||||
\ No newline at end of file
|
||||
+</amarokFS>
|
||||
66
amarokFS-0.5-fedora_paths.patch
Normal file
66
amarokFS-0.5-fedora_paths.patch
Normal file
|
|
@ -0,0 +1,66 @@
|
|||
diff -uNr amarokFS-0.5/amarokFS-xml.pro amarokFS-0.5-mod/amarokFS-xml.pro
|
||||
--- amarokFS-0.5/amarokFS-xml.pro 2007-03-19 14:17:58.000000000 +0200
|
||||
+++ amarokFS-0.5-mod/amarokFS-xml.pro 2007-03-29 10:11:52.000000000 +0200
|
||||
@@ -4,11 +4,7 @@
|
||||
CONFIG += qt warn_on release
|
||||
|
||||
INCLUDEPATH += /usr/include/kde
|
||||
-INCLUDEPATH += /usr/local/include/kde
|
||||
INCLUDEPATH += /usr/include
|
||||
-INCLUDEPATH += /opt/kde3/include
|
||||
-INCLUDEPATH += /opt/kde/include
|
||||
-INCLUDEPATH += /usr/kde/3.5/include
|
||||
|
||||
|
||||
HEADERS = amfs-xml.h \
|
||||
@@ -25,11 +21,7 @@
|
||||
label-pixmap.cpp
|
||||
|
||||
LIBS += -lkdecore
|
||||
-LIBS += -L/opt/kde3/lib
|
||||
-LIBS += -L/usr/local/kde3/lib
|
||||
-LIBS += -L/usr/lib/qt3
|
||||
-LIBS += -L/opt/kde/lib
|
||||
-LIBS += -L/usr/kde/3.5/lib
|
||||
+LIBS += -L/usr/lib/kde3
|
||||
LIBS += -lkio
|
||||
|
||||
images.path = /usr/share/amarokFS/images
|
||||
@@ -38,23 +30,16 @@
|
||||
defaultTheme.path = /usr/share/amarokFS
|
||||
defaultTheme.files = theme.xml
|
||||
|
||||
-target.path = /usr/local/bin
|
||||
+target.path = /usr/bin
|
||||
|
||||
icon.files = amarokFS.png
|
||||
-icon.path = /usr/share/icons/
|
||||
+icon.path = /usr/share/icons/hicolor/128x128/apps
|
||||
|
||||
desktop.files = amarokFS.desktop
|
||||
desktop.path = /usr/share/applications/
|
||||
|
||||
-docs.files = README
|
||||
-docs.files += theme-howto.txt
|
||||
-docs.path = /usr/share/doc/amarokFS
|
||||
-
|
||||
-
|
||||
INSTALLS += target
|
||||
INSTALLS += images
|
||||
-INSTALLS += desktop
|
||||
INSTALLS += icon
|
||||
INSTALLS += defaultTheme
|
||||
-INSTALLS += docs
|
||||
|
||||
diff -uNr amarokFS-0.5/amfs-xml.cpp amarokFS-0.5-mod/amfs-xml.cpp
|
||||
--- amarokFS-0.5/amfs-xml.cpp 2007-03-19 14:35:38.000000000 +0200
|
||||
+++ amarokFS-0.5-mod/amfs-xml.cpp 2007-03-29 10:13:36.000000000 +0200
|
||||
@@ -120,7 +120,7 @@
|
||||
|
||||
contextMenu->insertSeparator();
|
||||
aboutAct = new QAction(tr("&About"), 0, this);
|
||||
- aboutAct->setIconSet(QIconSet(QPixmap("/usr/share/icons/amarokFS.png")));
|
||||
+ aboutAct->setIconSet(QIconSet(QPixmap("/usr/share/icons/hicolor/128x128/apps/amarokFS.png")));
|
||||
aboutAct->setStatusTip(tr("Show About Dialog."));
|
||||
connect(aboutAct, SIGNAL(activated()), this, SLOT(launchAbout()));
|
||||
aboutAct->addTo(contextMenu);
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
diff -uNr amarokFS-qt3-0.4.2/amfs-xml.cpp amarokFS-qt3-0.4.2-mod/amfs-xml.cpp
|
||||
--- amarokFS-qt3-0.4.2/amfs-xml.cpp 2007-02-11 18:57:18.000000000 +0200
|
||||
+++ amarokFS-qt3-0.4.2-mod/amfs-xml.cpp 2007-02-11 22:06:06.000000000 +0200
|
||||
@@ -14,6 +14,7 @@
|
||||
diff -uNr amarokFS-0.5/amfs-xml.cpp amarokFS-0.5-mod/amfs-xml.cpp
|
||||
--- amarokFS-0.5/amfs-xml.cpp 2007-03-19 14:35:38.000000000 +0200
|
||||
+++ amarokFS-0.5-mod/amfs-xml.cpp 2007-03-29 10:26:05.000000000 +0200
|
||||
@@ -16,6 +16,7 @@
|
||||
#include <qmessagebox.h>
|
||||
#include <qerrormessage.h>
|
||||
#include <qregexp.h>
|
||||
|
|
@ -9,7 +9,7 @@ diff -uNr amarokFS-qt3-0.4.2/amfs-xml.cpp amarokFS-qt3-0.4.2-mod/amfs-xml.cpp
|
|||
|
||||
using namespace std;
|
||||
|
||||
@@ -21,7 +22,7 @@
|
||||
@@ -23,7 +24,7 @@
|
||||
AmfsXML::AmfsXML( QWidget* parent, const char* name, WFlags fl )
|
||||
: QWidget( parent, name, fl ) {
|
||||
|
||||
|
|
@ -18,10 +18,11 @@ diff -uNr amarokFS-qt3-0.4.2/amfs-xml.cpp amarokFS-qt3-0.4.2-mod/amfs-xml.cpp
|
|||
progressBar = (QProgressBar *) 0;
|
||||
cdcover = (QLabel *) 0;
|
||||
gradient = (QLabel *) 0;
|
||||
@@ -339,6 +340,20 @@
|
||||
|
||||
connect( setupButton, SIGNAL(clicked()), this, SLOT(launchConfig()) );
|
||||
@@ -439,6 +440,20 @@
|
||||
mouseTimer->start( 5000, TRUE );
|
||||
|
||||
setMouseTracking(TRUE);
|
||||
+
|
||||
+ //start Amarok (if necessary)
|
||||
+ if (!dcopClient->isApplicationRegistered("amarok")) {
|
||||
+ QProcess *amarokProc = new QProcess(QString("amarok"));
|
||||
|
|
@ -35,31 +36,31 @@ diff -uNr amarokFS-qt3-0.4.2/amfs-xml.cpp amarokFS-qt3-0.4.2-mod/amfs-xml.cpp
|
|||
+ }
|
||||
+ delete amarokProc;
|
||||
+ }
|
||||
+
|
||||
setMouseTracking(TRUE);
|
||||
|
||||
nowPlaying = "";
|
||||
@@ -362,6 +377,11 @@
|
||||
{
|
||||
//restore the screen saver if it was disabled
|
||||
updateTrackLabels();
|
||||
@@ -472,6 +487,11 @@
|
||||
if(isSetDisScrSvr) restoreScreenSaver();
|
||||
//restore OSD if it was disabled
|
||||
if(isSetDisAmaOSD) restoreAmarokOSD();
|
||||
+ //stop Amarok (if it was started by AmarokFS)
|
||||
+ if (startedAmarok) {
|
||||
+ if (!dcopClient->send("amarok", "MainApplication-Interface", "quit()", (QByteArray) 0))
|
||||
+ qDebug("there was some error using DCOP.");
|
||||
+ qDebug("there was some error using DCOP.");
|
||||
+ }
|
||||
ce->accept();
|
||||
return;
|
||||
}
|
||||
diff -uNr amarokFS-qt3-0.4.2/amfs-xml.h amarokFS-qt3-0.4.2-mod/amfs-xml.h
|
||||
--- amarokFS-qt3-0.4.2/amfs-xml.h 2007-02-11 18:57:18.000000000 +0200
|
||||
+++ amarokFS-qt3-0.4.2-mod/amfs-xml.h 2007-02-11 21:27:00.000000000 +0200
|
||||
@@ -39,6 +39,8 @@
|
||||
AKControlButton *cb;
|
||||
QLabel *b;
|
||||
QPushButton* pushButton1;
|
||||
diff -uNr amarokFS-0.5/amfs-xml.h amarokFS-0.5-mod/amfs-xml.h
|
||||
--- amarokFS-0.5/amfs-xml.h 2007-03-19 13:59:03.000000000 +0200
|
||||
+++ amarokFS-0.5-mod/amfs-xml.h 2007-03-29 10:27:00.000000000 +0200
|
||||
@@ -96,6 +96,9 @@
|
||||
|
||||
AmarokFS_config *configWindow;
|
||||
|
||||
+ //stores whether Amarok was started by AmarokFS (true) or by the user
|
||||
+ bool startedAmarok;
|
||||
+
|
||||
|
||||
private:
|
||||
QString getDCOPDataText(QCString func);
|
||||
private slots:
|
||||
void updateTime();
|
||||
15
amarokFS-0.5-theme_howto.patch
Normal file
15
amarokFS-0.5-theme_howto.patch
Normal file
|
|
@ -0,0 +1,15 @@
|
|||
diff -uNr amarokFS-0.5/theme-howto.txt amarokFS-0.5-mod/theme-howto.txt
|
||||
--- amarokFS-0.5/theme-howto.txt 2007-03-29 10:31:28.000000000 +0200
|
||||
+++ amarokFS-0.5-mod/theme-howto.txt 2007-03-29 10:30:08.000000000 +0200
|
||||
@@ -32,9 +32,9 @@
|
||||
i) "align" defines horizontal alignment, values are: 0 for auto, 1 for left, 2 for right, 4 for center and 5 for justify;
|
||||
j) "valign" defines vertical alignment, values are: 16 for top, 32 for bottom, 64 for center
|
||||
|
||||
-4) The "labelInstant" Element defines a text-label similar to trackLabel. The only difference is that it changes every second. It has the same subelements as "labelTrack".
|
||||
+4) The "labelInstant" Element defines a text-label similar to labelTrack. The only difference is that it changes every second. It has the same subelements as "labelTrack".
|
||||
|
||||
-5) The "labelStatic" Element defines a text-label similar to trackLabel. The only difference is that it never changes. It has the same subelements as "labelTrack" except:
|
||||
+5) The "labelStatic" Element defines a text-label similar to labelTrack. The only difference is that it never changes. It has the same subelements as "labelTrack" except:
|
||||
a) "text" determines the content (and "command" is ignored)
|
||||
|
||||
6) The "labelPixmap" Element defines an picture element, it is something between "button" and "labelStatic" - it uses a picture but does nothing and doesn't change:
|
||||
|
|
@ -1,20 +1,17 @@
|
|||
Name: amarokFS
|
||||
Version: 0.4.2
|
||||
Release: 4%{?dist}
|
||||
Version: 0.5
|
||||
Release: 1%{?dist}
|
||||
Summary: Simple, nice looking full screen front-end for Amarok
|
||||
|
||||
Group: Applications/Multimedia
|
||||
License: GPL
|
||||
URL: http://www.kde-apps.org/content/show.php?content=52641
|
||||
Source0: http://www.kde-apps.org/CONTENT/content-files/52641-amarokFS-qt3-%{version}.tar.gz
|
||||
Source0: http://www.kde-apps.org/CONTENT/content-files/52641-amarokFS-%{version}.tar.gz
|
||||
# Source1 is an Amarok integration script
|
||||
Source1: http://www.kde-apps.org/CONTENT/content-files/53125-amarokFS.amarokscript.tar
|
||||
Patch0: amarokFS-0.4.2-fedora_paths.patch
|
||||
Patch1: amarokFS-0.4.2-config_dialog_layout.patch
|
||||
Patch2: amarokFS-0.4.2-large_cover_images.patch
|
||||
Patch3: amarokFS-0.4.2-start_amarok.patch
|
||||
Patch4: amarokFS-0.4.2-theme_howto.patch
|
||||
Patch5: amarokFS-0.4.2-theme_prev_button.patch
|
||||
Source1: http://www.kde-apps.org/CONTENT/content-files/53125-amarokFS-1.1.amarokscript.tar
|
||||
Patch0: amarokFS-0.5-fedora_paths.patch
|
||||
Patch1: amarokFS-0.5-start_amarok.patch
|
||||
Patch2: amarokFS-0.5-theme_howto.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
|
||||
BuildRequires: kdelibs-devel desktop-file-utils ImageMagick
|
||||
|
|
@ -31,13 +28,13 @@ from within Amarok itself.
|
|||
|
||||
|
||||
%prep
|
||||
%setup -q -n %{name}-qt3-%{version}
|
||||
%setup -q
|
||||
%patch0 -p1 -b .fedora_paths
|
||||
%patch1 -p1 -b .config_dialog_layout
|
||||
%patch2 -p1 -b .large_cover_images
|
||||
%patch3 -p1 -b .start_amarok
|
||||
%patch4 -p1 -b .theme_howto
|
||||
%patch5 -p1 -b .theme_prev_button
|
||||
#%patch1 -p1 -b .config_dialog_layout
|
||||
#%patch2 -p1 -b .large_cover_images
|
||||
%patch1 -p1 -b .start_amarok
|
||||
%patch2 -p1 -b .theme_howto
|
||||
#%patch5 -p1 -b .theme_prev_button
|
||||
sed -i 's/Application;//' amarokFS.desktop
|
||||
sed -i 's/\/usr\/share\/icons\/amarokFS.png/amarokFS/' amarokFS.desktop
|
||||
chmod a-x amarokFS.png
|
||||
|
|
@ -91,6 +88,15 @@ touch --no-create %{_datadir}/icons/hicolor || :
|
|||
|
||||
|
||||
%changelog
|
||||
* Thu Mar 29 2007 Francois Aucamp <faucamp@csir.co.za> - 0.5-1
|
||||
- Update to version 0.5
|
||||
- Removed "large_cover_images" patch; included upstream
|
||||
- Removed "config_dialog_layout" patch; included upstream
|
||||
- Updated "fedora_paths" patch
|
||||
- Updated "start_amarok" patch
|
||||
- Updated "theme_howto" patch
|
||||
- Updated amarok integration script
|
||||
|
||||
* Mon Feb 19 2007 Francois Aucamp <faucamp@csir.co.za> - 0.4.2-4
|
||||
- Created "theme_prev_button" patch to fix default theme's "previous" button
|
||||
- Fixed file permissions of image files
|
||||
|
|
|
|||
4
sources
4
sources
|
|
@ -1,2 +1,2 @@
|
|||
94d955be8f7a0454d341ae8501d00318 52641-amarokFS-qt3-0.4.2.tar.gz
|
||||
c6984db590fdb083dffc98d2a3bc8821 53125-amarokFS.amarokscript.tar
|
||||
28b7432fa9abfb0a2211940990b3945a 52641-amarokFS-0.5.tar.gz
|
||||
03725c25ef10c1e1e6ed07c69aed665c 53125-amarokFS-1.1.amarokscript.tar
|
||||
|
|
|
|||
Reference in a new issue