diff --git a/amarokFS-0.4.2-config_dialog_layout.patch b/amarokFS-0.4.2-config_dialog_layout.patch deleted file mode 100644 index d7a7ebe..0000000 --- a/amarokFS-0.4.2-config_dialog_layout.patch +++ /dev/null @@ -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"; diff --git a/amarokFS-0.4.2-fedora_paths.patch b/amarokFS-0.4.2-fedora_paths.patch deleted file mode 100644 index 1f30f47..0000000 --- a/amarokFS-0.4.2-fedora_paths.patch +++ /dev/null @@ -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. - diff --git a/amarokFS-0.4.2-large_cover_images.patch b/amarokFS-0.4.2-large_cover_images.patch deleted file mode 100644 index 6af03c2..0000000 --- a/amarokFS-0.4.2-large_cover_images.patch +++ /dev/null @@ -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 - #include - #include -+#include - - 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/"); - diff --git a/amarokFS-0.4.2-theme_howto.patch b/amarokFS-0.4.2-theme_howto.patch deleted file mode 100644 index 9819c37..0000000 --- a/amarokFS-0.4.2-theme_howto.patch +++ /dev/null @@ -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: diff --git a/amarokFS-0.4.2-theme_prev_button.patch b/amarokFS-0.4.2-theme_prev_button.patch deleted file mode 100644 index 170a5e0..0000000 --- a/amarokFS-0.4.2-theme_prev_button.patch +++ /dev/null @@ -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 @@ - -