Attachment #80739 for bug #115757

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

Lines 5-12 Link Here

(-)amarok/Makefile (-2 / +6 lines)
5	# $FreeBSD: ports/audio/amarok/Makefile,v 1.74 2007/08/15 17:24:04 sat Exp $	5	# $FreeBSD: ports/audio/amarok/Makefile,v 1.74 2007/08/15 17:24:04 sat Exp $
6		6
7	PORTNAME= amarok	7	PORTNAME= amarok
8	PORTVERSION= 1.4.5	8	PORTVERSION= 1.4.7
9	PORTREVISION= 8
10	CATEGORIES= audio kde	9	CATEGORIES= audio kde
11	MASTER_SITES= ${MASTER_SITE_KDE}	10	MASTER_SITES= ${MASTER_SITE_KDE}
12	MASTER_SITE_SUBDIR= stable/${PORTNAME}/${PORTVERSION}/src	11	MASTER_SITE_SUBDIR= stable/${PORTNAME}/${PORTVERSION}/src
Lines 36-41 Link Here
36	AMAZON "Amazon cover fetching support" on \	35	AMAZON "Amazon cover fetching support" on \
37	MYSQL "Use MySQL as collection backend" off \	36	MYSQL "Use MySQL as collection backend" off \
38	POSTGRESQL "Use PostgreSQL as collection backend" off \	37	POSTGRESQL "Use PostgreSQL as collection backend" off \
		38	HIDEMENUBAR "Revert the 'Hide Menubar' feature" off \
39		39
40	.include <bsd.port.pre.mk>	40	.include <bsd.port.pre.mk>
41		41
Lines 85-90 Link Here
85	.if defined(WITH_POSTGRESQL)	85	.if defined(WITH_POSTGRESQL)
86	USE_PGSQL= yes	86	USE_PGSQL= yes
87	CONFIGURE_ARGS+=--enable-postgresql	87	CONFIGURE_ARGS+=--enable-postgresql
		88	.endif
		89
		90	.if defined(WITH_HIDEMENUBAR)
		91	EXTRA_PATCHES= ${PATCHDIR}/hide-main-menu-bar-feature.patch
88	.endif	92	.endif
89		93
90	.if defined(DEBUG)	94	.if defined(DEBUG)

Lines 1-3 Link Here

(-)amarok/distinfo (-3 / +3 lines)
1	MD5 (amarok-1.4.5.tar.bz2) = 1dac1cb5ac9c9cdabdab5f69b39e92c8	1	MD5 (amarok-1.4.7.tar.bz2) = f1299e142da8a69bc3cff5d585e38d43
2	SHA256 (amarok-1.4.5.tar.bz2) = 45aa7cafe2a46dd988cd5034ae19da988926eecb2ac90d3e6912c57e558108c8	2	SHA256 (amarok-1.4.7.tar.bz2) = 7ef2691d0cda238696e021421052a04b3cfb068ea0d9854e0c617b33216340f8
3	SIZE (amarok-1.4.5.tar.bz2) = 18034110	3	SIZE (amarok-1.4.7.tar.bz2) = 12723499




diff -ruN amarok.orig/src/amarokcore/amarok.kcfg amarok/src/amarokcore/amarok.kcfg
--- amarok.orig/src/amarokcore/amarok.kcfg	Mon Jun 18 01:51:49 2007
+++ amarok/src/amarokcore/amarok.kcfg	Thu Jun 21 22:42:23 2007
@@ -216,6 +216,11 @@
         <whatsthis>Set this to the style dir you want to use.</whatsthis>
         <default>Default</default>
     </entry>
+    <entry key="Show Menu Bar" type="Bool">
+        <label>Whether Menubar is shown</label>
+        <whatsthis>If set, Amarok displays a menubar on top of the application.</whatsthis>
+        <default>true</default>
+    </entry>
     <entry key="Relative Playlist" type="Bool">
         <label>Whether playlists store relative path</label>
         <whatsthis>If set, Amarok's manually saved playlists will contain a relative path to each track, not an absolute path.</whatsthis>
diff -ruN amarok.orig/src/app.cpp amarok/src/app.cpp
--- amarok.orig/src/app.cpp	Mon Jun 18 01:51:49 2007
+++ amarok/src/app.cpp	Thu Jun 21 22:43:27 2007
@@ -678,6 +674,11 @@
             m_pPlaylistWindow->setCaption( i18n("Amarok - %1").arg( EngineController::instance()->bundle().veryNiceTitle() ) );
         else
             m_pPlaylistWindow->setCaption( "Amarok" );
+	    
+        //m_pPlaylistWindow->show(); //must be shown //we do below now
+        //ensure that at least one Menu is plugged into an accessible UI element
+        if( !AmarokConfig::showMenuBar() && !Amarok::actionCollection()->action( "amarok_menu" )->isPlugged() )
+	    playlistWindow()->createGUI();
     }
 
     playlistWindow()->applySettings();
diff -ruN amarok.orig/src/playlistwindow.cpp amarok/src/playlistwindow.cpp
--- amarok.orig/src/playlistwindow.cpp	Mon Jun 18 01:51:49 2007
+++ amarok/src/playlistwindow.cpp	Thu Jun 21 22:48:15 2007
@@ -139,6 +139,7 @@
     ac->action( "stream_add" )->setIcon( Amarok::icon( "files" ) );
     KStdAction::save( this, SLOT(savePlaylist()), ac, "playlist_save" )->setText( i18n("&Save Playlist As...") );
     ac->action( "playlist_save" )->setIcon( Amarok::icon( "save" ) );
+    KStdAction::showMenubar( this, SLOT(slotToggleMenu()), ac );
 
     //FIXME: after string freeze rename to "Burn Current Playlist"?
     new KAction( i18n("Burn to CD"), Amarok::icon( "burn" ), 0, this, SLOT(slotBurnPlaylist()), ac, "playlist_burn" );
@@ -233,6 +236,7 @@
 
 PlaylistWindow::~PlaylistWindow()
 {
+    Amarok::config( "PlaylistWindow" )->writeEntry( "showMenuBar", m_menubar->isShown() );
     AmarokConfig::setPlaylistWindowPos( pos() );  //TODO de XT?
     AmarokConfig::setPlaylistWindowSize( size() ); //TODO de XT?
 }
@@ -307,6 +310,7 @@
     connect( repeatAction, SIGNAL( activated( int ) ), playlist, SLOT( slotRepeatTrackToggled( int ) ) );
 
     m_menubar = new KMenuBar( this );
+    m_menubar->setShown( AmarokConfig::showMenuBar() );
 
     //BEGIN Actions menu
     KPopupMenu *actionsMenu = new KPopupMenu( m_menubar );
@@ -381,6 +388,8 @@
     m_settingsMenu = new KPopupMenu( m_menubar );
     //TODO use KStdAction or KMainWindow
 #ifndef Q_WS_MAC
+    static_cast<KToggleAction *>(actionCollection()->action(KStdAction::name(KStdAction::ShowMenubar)))->setChecked( AmarokConfig::showMenuBar() );
+    actionCollection()->action(KStdAction::name(KStdAction::ShowMenubar))->plug( m_settingsMenu );
     m_settingsMenu->insertItem( AmarokConfig::showToolbar() ? i18n( "Hide Toolbar" ) : i18n("Show Toolbar"), ID_SHOW_TOOLBAR );
     m_settingsMenu->insertItem( AmarokConfig::showPlayerWindow() ? i18n("Hide Player &Window") : i18n("Show Player &Window"), ID_SHOW_PLAYERWINDOW );
     m_settingsMenu->insertSeparator();
@@ -569,6 +578,12 @@
     for( QStringList::ConstIterator it = list.constBegin(); it != end; ++it )
     {
         KToolBarButton* const button = static_cast<KToolBarButton*>( m_toolbar->child( (*it).latin1() ) );
+        if ( it == last ) {
+            //if the user has no PlayerWindow, he MUST have the menu action plugged
+            //NOTE this is not saved to the local XMLFile, which is what the user will want
+            if ( !AmarokConfig::showPlayerWindow() && !AmarokConfig::showMenuBar() && !button )
+                actionCollection()->action( "amarok_menu" )->plug( m_toolbar );
+        }
 
         if ( button ) {
             button->modeChange();
@@ -1031,6 +1046,20 @@
         Playlist::instance()->setFocus();
 }
 
+void PlaylistWindow::slotToggleMenu() //SLOT
+{
+    if( static_cast<KToggleAction *>(actionCollection()->action(KStdAction::name(KStdAction::ShowMenubar)))->isChecked() ) {
+        AmarokConfig::setShowMenuBar( true );
+        m_menubar->setShown( true );
+    }
+    else
+    {
+        AmarokConfig::setShowMenuBar( false );
+        m_menubar->setShown( false );
+    }
+    recreateGUI();
+}
+
 void PlaylistWindow::slotMenuActivated( int index ) //SLOT
 {
     switch( index )
@@ -1042,6 +1071,7 @@
     case ID_SHOW_TOOLBAR:
         m_toolbar->setShown( !m_toolbar->isShown() );
         AmarokConfig::setShowToolbar( !AmarokConfig::showToolbar() );
+        actionCollection()->action(KStdAction::name(KStdAction::ShowMenubar))->setEnabled( m_toolbar->isShown() );
         m_settingsMenu->changeItem( index, m_toolbar->isShown() ? i18n("Hide Toolbar") : i18n("Show Toolbar") );
         break;
     case ID_SHOW_PLAYERWINDOW:
diff -ruN amarok.orig/src/playlistwindow.h amarok/src/playlistwindow.h
--- amarok.orig/src/playlistwindow.h	Mon Jun 18 01:51:49 2007
+++ amarok/src/playlistwindow.h	Thu Jun 21 22:48:44 2007
@@ -91,6 +91,7 @@
         void slotMenuActivated( int );
         void actionsMenuAboutToShow();
         void toolsMenuAboutToShow();
+        void slotToggleMenu();	
         void slotToggleFocus();
         void slotEditFilter();
         void slotSetFilter( const QString &filter );




--- amarok/src/mediadevice/generic/genericmediadevice.cpp.orig	Mon Feb 12 23:01:20 2007
+++ amarok/src/mediadevice/generic/genericmediadevice.cpp	Mon Feb 12 23:01:29 2007
@@ -418,13 +418,7 @@
         if( m_medium.mountPoint() == (*mountiter)->mountPoint() )
             m_medium.setFsType( (*mountiter)->mountType() );
     }
-    m_actuallyVfat = m_medium.fsType() == 
-#ifdef __FreeBSD__
-        "msdosfs"
-#else
-        "vfat" 
-#endif
-        ? true : false;
+    m_actuallyVfat = (m_medium.fsType() == "vfat" || m_medium.fsType() == "msdosfs") ? true : false;
     m_connected = true;
     m_transferDir = m_medium.mountPoint();
     m_initialFile = new GenericMediaFile( 0, m_medium.mountPoint(), this );


Lines 1-11 Link Here

(-)amarok/files/patch-amarok_src_sqlite_fts1.c (-11 lines)
1	--- amarok/src/sqlite/fts1.c.orig Thu Feb 1 23:14:17 2007
2	+++ amarok/src/sqlite/fts1.c Sat Feb 3 01:51:38 2007
3	@@ -19,7 +19,7 @@
4	#endif
5
6	#include <assert.h>
7	-#if !defined(__APPLE__)
8	+#if !defined(__APPLE__) && !defined(__FreeBSD__)
9	#include <malloc.h>
10	#else
11	#include <stdlib.h>

Lines 1-11 Link Here

(-)amarok/files/patch-amarok_src_sqlite_fts1__porter.c (-11 lines)
1	--- amarok/src/sqlite/fts1_porter.c.orig Thu Feb 1 23:14:17 2007
2	+++ amarok/src/sqlite/fts1_porter.c Sat Feb 3 01:51:55 2007
3	@@ -26,7 +26,7 @@
4
5
6	#include <assert.h>
7	-#if !defined(__APPLE__)
8	+#if !defined(__APPLE__) && !defined(__FreeBSD__)
9	#include <malloc.h>
10	#else
11	#include <stdlib.h>

Lines 1-11 Link Here

(-)amarok/files/patch-amarok_src_sqlite_fts1__tokenizer1.c (-11 lines)
1	--- amarok/src/sqlite/fts1_tokenizer1.c.orig Thu Feb 1 23:14:17 2007
2	+++ amarok/src/sqlite/fts1_tokenizer1.c Sat Feb 3 01:52:07 2007
3	@@ -18,7 +18,7 @@
4
5
6	#include <assert.h>
7	-#if !defined(__APPLE__)
8	+#if !defined(__APPLE__) && !defined(__FreeBSD__)
9	#include <malloc.h>
10	#else
11	#include <stdlib.h>




bin/amarok
bin/amarokapp
bin/amarokcollectionscanner
bin/amarok_daapserver.rb
bin/amarok_proxy.rb
bin/amarokapp
bin/amarokcollectionscanner
lib/libamarok.so
lib/libamarok.so.0
lib/kde3/konqsidebar_universalamarok.a
lib/kde3/konqsidebar_universalamarok.la
lib/kde3/konqsidebar_universalamarok.so
lib/kde3/libamarok_daap-mediadevice.so
lib/kde3/libamarok_daap-mediadevice.la
lib/kde3/libamarok_daap-mediadevice.a
lib/kde3/libamarok_daap-mediadevice.la
lib/kde3/libamarok_daap-mediadevice.so
lib/kde3/libamarok_generic-mediadevice.a
lib/kde3/libamarok_generic-mediadevice.la
lib/kde3/libamarok_generic-mediadevice.so
lib/kde3/libamarok_massstorage-device.a
lib/kde3/libamarok_massstorage-device.la
lib/kde3/libamarok_massstorage-device.so
%%GPOD%%lib/kde3/libamarok_ipod-mediadevice.a
%%GPOD%%lib/kde3/libamarok_ipod-mediadevice.la
%%GPOD%%lib/kde3/libamarok_ipod-mediadevice.so
%%MTP%%lib/kde3/libamarok_mtp-mediadevice.a
%%MTP%%lib/kde3/libamarok_mtp-mediadevice.la
%%MTP%%lib/kde3/libamarok_mtp-mediadevice.so
lib/kde3/libamarok_nfs-device.a
lib/kde3/libamarok_nfs-device.la
lib/kde3/libamarok_nfs-device.so
lib/kde3/libamarok_smb-device.a
%%NJB%%lib/kde3/libamarok_njb-mediadevice.so
%%NJB%%lib/kde3/libamarok_njb-mediadevice.la
%%NJB%%lib/kde3/libamarok_njb-mediadevice.a
%%NJB%%lib/kde3/libamarok_njb-mediadevice.la
%%NJB%%lib/kde3/libamarok_njb-mediadevice.so
lib/kde3/libamarok_smb-device.a
lib/kde3/libamarok_smb-device.la
lib/kde3/libamarok_smb-device.so
lib/kde3/libamarok_xine-engine.so
lib/kde3/libamarok_void-engine_plugin.a
lib/kde3/libamarok_void-engine_plugin.la
lib/kde3/libamarok_void-engine_plugin.so
lib/kde3/libamarok_xine-engine.a
lib/kde3/libamarok_xine-engine.la
lib/kde3/libamarok_xine-engine.so
lib/libamarok.a
lib/libamarok.la
lib/libamarok.so
lib/libamarok.so.0
lib/ruby_lib/http11.rb
lib/ruby_lib/libhttp11.so.0
lib/ruby_lib/libhttp11.so
lib/ruby_lib/libhttp11.la
lib/ruby_lib/libhttp11.a
lib/ruby_lib/libhttp11.la
lib/ruby_lib/libhttp11.so
lib/ruby_lib/libhttp11.so.0
share/applications/kde/amarok.desktop
share/apps/amarok/amarokui.rc
share/apps/amarok/data/Amarok_1.4_Welcome.ogg

share/apps/amarok/icons/crystalsvg/22x22/actions/player_playlist_2.png
share/apps/amarok/icons/crystalsvg/22x22/actions/random.png
share/apps/amarok/icons/crystalsvg/22x22/actions/repeat_playlist.png
share/apps/amarok/icons/crystalsvg/22x22/actions/visualizations.png
share/apps/amarok/icons/crystalsvg/64x64/actions/dynamic.png
share/apps/amarok/icons/crystalsvg/64x64/actions/podcast.png
share/apps/amarok/icons/crystalsvg/64x64/actions/podcast_new.png

share/apps/amarok/images/vol_speaker.png
share/apps/amarok/images/volumeslider-gradient.png
share/apps/amarok/images/volumeslider-handle.png
share/apps/amarok/images/volumeslider-inset.png
share/apps/amarok/images/volumeslider-handle_glow.png
share/apps/amarok/images/volumeslider-inset.png
share/apps/amarok/images/wizard_compact.png
share/apps/amarok/images/wizard_xmms.png
share/apps/amarok/images/xine_logo.png
share/apps/amarok/ruby_lib/codes.rb
share/apps/amarok/ruby_lib/gemconfigure.rb
share/apps/amarok/ruby_lib/gem_plugin.rb
share/apps/amarok/ruby_lib/gemconfigure.rb
share/apps/amarok/ruby_lib/mongrel.rb
share/apps/amarok/ruby_lib/rubygems.rb
share/apps/amarok/ruby_lib/mongrel/cgi.rb
share/apps/amarok/ruby_lib/mongrel/command.rb
share/apps/amarok/ruby_lib/mongrel/configurator.rb

share/apps/amarok/ruby_lib/mongrel/stats.rb
share/apps/amarok/ruby_lib/mongrel/tcphack.rb
share/apps/amarok/ruby_lib/rbconfig/datadir.rb
share/apps/amarok/ruby_lib/rubygems.rb
share/apps/amarok/ruby_lib/rubygems/._gem_commands.rb
share/apps/amarok/ruby_lib/rubygems/builder.rb
share/apps/amarok/ruby_lib/rubygems/cmd_manager.rb

share/apps/amarok/scripts/lyrics_lyrc/lyrics_lyrc.spec
share/apps/amarok/scripts/playlist2html/Playlist.py
share/apps/amarok/scripts/playlist2html/PlaylistServer.py
share/apps/amarok/scripts/playlist2html/PlaylistServer.spec
share/apps/amarok/scripts/playlist2html/README
share/apps/amarok/scripts/playlist2html/playlist2html.py
share/apps/amarok/scripts/playlist2html/playlist2html.spec
share/apps/amarok/scripts/ruby_debug/debug.rb
share/apps/amarok/scripts/score_default/COPYING
share/apps/amarok/scripts/score_default/README
share/apps/amarok/scripts/score_default/score_default.spec
share/apps/amarok/scripts/score_default/score_default.rb
share/apps/amarok/scripts/score_default/score_default.spec
share/apps/amarok/scripts/score_impulsive/COPYING
share/apps/amarok/scripts/score_impulsive/README
share/apps/amarok/scripts/score_impulsive/score_impulsive.spec
share/apps/amarok/scripts/score_impulsive/score_impulsive.rb
share/apps/amarok/scripts/score_impulsive/score_impulsive.spec
share/apps/amarok/scripts/templates/amarok.rb
share/apps/amarok/scripts/templates/python_qt_template.py
share/apps/amarok/scripts/templates/ruby_qt_template.rb

share/apps/amarok/scripts/webcontrol/player_play.png
share/apps/amarok/scripts/webcontrol/player_start.png
share/apps/amarok/scripts/webcontrol/player_stop.png
share/apps/amarok/scripts/webcontrol/template.thtml
share/apps/amarok/scripts/webcontrol/smallstar.png
share/apps/amarok/scripts/webcontrol/star.png
share/apps/amarok/scripts/webcontrol/template.thtml
share/apps/amarok/scripts/webcontrol/vol_speaker.png
share/apps/amarok/themes/example/stylesheet.css
share/apps/amarok/themes/reinhardt/images/background.png

share/doc/HTML/da/amarok/requirements.docbook
share/doc/HTML/da/amarok/using.docbook
share/doc/HTML/de/amarok/add_dynamic.png
share/doc/HTML/de/amarok/amarok_playlist.png
share/doc/HTML/de/amarok/advanced.docbook
share/doc/HTML/de/amarok/amarok_playlist.png
share/doc/HTML/de/amarok/analyzer.png
share/doc/HTML/de/amarok/buttons.png
share/doc/HTML/de/amarok/collection.png
share/doc/HTML/de/amarok/common
share/doc/HTML/de/amarok/config.docbook
share/doc/HTML/de/amarok/config_appearance.png
share/doc/HTML/de/amarok/config_collection.png

share/doc/HTML/de/amarok/config_playback.png
share/doc/HTML/de/amarok/config_scrobbler.png
share/doc/HTML/de/amarok/context.png
share/doc/HTML/de/amarok/common
share/doc/HTML/de/amarok/coverman.png
share/doc/HTML/de/amarok/develop.docbook
share/doc/HTML/de/amarok/dynamic_bar.png
share/doc/HTML/de/amarok/dynamic_settings.png
share/doc/HTML/de/amarok/equalizer.png
share/doc/HTML/de/amarok/faq.docbook
share/doc/HTML/de/amarok/file_browser.png
share/doc/HTML/de/amarok/hidden.docbook
share/doc/HTML/de/amarok/index.cache.bz2
share/doc/HTML/de/amarok/index.docbook
share/doc/HTML/de/amarok/logo.png

share/doc/HTML/de/amarok/using.docbook
share/doc/HTML/de/amarok/vis_window.png
share/doc/HTML/en/amarok/add_dynamic.png
share/doc/HTML/en/amarok/amarok_playlist.png
share/doc/HTML/en/amarok/advanced.docbook
share/doc/HTML/en/amarok/amarok_playlist.png
share/doc/HTML/en/amarok/analyzer.png
share/doc/HTML/en/amarok/buttons.png
share/doc/HTML/en/amarok/collection.png

share/doc/HTML/es/amarok/using.docbook
share/doc/HTML/es/amarok/vis_window.png
share/doc/HTML/et/amarok/advanced.docbook
share/doc/HTML/et/amarok/common
share/doc/HTML/et/amarok/config.docbook
share/doc/HTML/et/amarok/common
share/doc/HTML/et/amarok/develop.docbook
share/doc/HTML/et/amarok/faq.docbook
share/doc/HTML/et/amarok/feature_guide.docbook

share/doc/HTML/et/amarok/requirements.docbook
share/doc/HTML/et/amarok/using.docbook
share/doc/HTML/fr/amarok/advanced.docbook
share/doc/HTML/fr/amarok/common
share/doc/HTML/fr/amarok/config.docbook
share/doc/HTML/fr/amarok/common
share/doc/HTML/fr/amarok/faq.docbook
share/doc/HTML/fr/amarok/feature_guide.docbook
share/doc/HTML/fr/amarok/index.cache.bz2

share/doc/HTML/fr/amarok/quick.docbook
share/doc/HTML/fr/amarok/requirements.docbook
share/doc/HTML/fr/amarok/using.docbook
share/doc/HTML/it/amarok/advanced.docbook
share/doc/HTML/it/amarok/add_dynamic.png
share/doc/HTML/it/amarok/advanced.docbook
share/doc/HTML/it/amarok/amarok_playlist.png
share/doc/HTML/it/amarok/analyzer.png
share/doc/HTML/it/amarok/buttons.png

share/doc/HTML/it/amarok/using.docbook
share/doc/HTML/it/amarok/vis_window.png
share/doc/HTML/nl/amarok/add_dynamic.png
share/doc/HTML/nl/amarok/amarok_playlist.png
share/doc/HTML/nl/amarok/advanced.docbook
share/doc/HTML/nl/amarok/amarok_playlist.png
share/doc/HTML/nl/amarok/analyzer.png
share/doc/HTML/nl/amarok/buttons.png
share/doc/HTML/nl/amarok/collection.png

share/doc/HTML/nl/amarok/coverman.png
share/doc/HTML/nl/amarok/develop.docbook
share/doc/HTML/nl/amarok/dynamic_bar.png
share/doc/HTML/nl/amarok/dynamic_settings.png
share/doc/HTML/nl/amarok/equalizer.png
share/doc/HTML/nl/amarok/faq.docbook
share/doc/HTML/nl/amarok/feature_guide.docbook

share/doc/HTML/nl/amarok/hidden.docbook
share/doc/HTML/nl/amarok/index.cache.bz2
share/doc/HTML/nl/amarok/index.docbook
share/doc/HTML/nl/amarok/logo.png
share/doc/HTML/nl/amarok/media_device.png
share/doc/HTML/nl/amarok/menubar.png
share/doc/HTML/nl/amarok/musicbrainz.png
share/doc/HTML/nl/amarok/pl_browser.png
share/doc/HTML/nl/amarok/pl_tip1.png
share/doc/HTML/nl/amarok/play_list.png
share/doc/HTML/nl/amarok/playlist_browser.png
share/doc/HTML/nl/amarok/player_window.png
share/doc/HTML/nl/amarok/playlist_browser.png
share/doc/HTML/nl/amarok/playlist_window.png
share/doc/HTML/nl/amarok/plugin.docbook
share/doc/HTML/nl/amarok/queue_manager.png

share/doc/HTML/nl/amarok/tab_wiki.png
share/doc/HTML/nl/amarok/using.docbook
share/doc/HTML/nl/amarok/vis_window.png
share/doc/HTML/pl/amarok/requirements.docbook
share/doc/HTML/pl/amarok/advanced.docbook
share/doc/HTML/pl/amarok/config.docbook
share/doc/HTML/pl/amarok/common
share/doc/HTML/pl/amarok/faq.docbook
share/doc/HTML/pl/amarok/index.cache.bz2
share/doc/HTML/pl/amarok/index.docbook
share/doc/HTML/pl/amarok/quick.docbook
share/doc/HTML/pl/amarok/requirements.docbook
share/doc/HTML/pl/amarok/using.docbook
share/doc/HTML/pt/amarok/add_dynamic.png
share/doc/HTML/pt/amarok/advanced.docbook
share/doc/HTML/pt/amarok/amarok_playlist.png

share/doc/HTML/pt/amarok/using.docbook
share/doc/HTML/pt/amarok/vis_window.png
share/doc/HTML/pt_BR/amarok/advanced.docbook
share/doc/HTML/pt_BR/amarok/common
share/doc/HTML/pt_BR/amarok/config.docbook
share/doc/HTML/pt_BR/amarok/common
share/doc/HTML/pt_BR/amarok/faq.docbook
share/doc/HTML/pt_BR/amarok/feature_guide.docbook
share/doc/HTML/pt_BR/amarok/index.cache.bz2

share/locale/af/LC_MESSAGES/amarok.mo
share/locale/ar/LC_MESSAGES/amarok.mo
share/locale/az/LC_MESSAGES/amarok.mo
share/locale/be/LC_MESSAGES/amarok.mo
share/locale/bg/LC_MESSAGES/amarok.mo
share/locale/bn/LC_MESSAGES/amarok.mo
share/locale/br/LC_MESSAGES/amarok.mo
share/locale/ca/LC_MESSAGES/amarok.mo
share/locale/cs/LC_MESSAGES/amarok.mo

share/locale/de/LC_MESSAGES/amarok.mo
share/locale/el/LC_MESSAGES/amarok.mo
share/locale/en_GB/LC_MESSAGES/amarok.mo
share/locale/eo/LC_MESSAGES/amarok.mo
share/locale/es/LC_MESSAGES/amarok.mo
share/locale/et/LC_MESSAGES/amarok.mo
share/locale/eu/LC_MESSAGES/amarok.mo
share/locale/fa/LC_MESSAGES/amarok.mo
share/locale/fi/LC_MESSAGES/amarok.mo
share/locale/fr/LC_MESSAGES/amarok.mo

share/locale/he/LC_MESSAGES/amarok.mo
share/locale/hi/LC_MESSAGES/amarok.mo
share/locale/hu/LC_MESSAGES/amarok.mo
share/locale/id/LC_MESSAGES/amarok.mo
share/locale/is/LC_MESSAGES/amarok.mo
share/locale/it/LC_MESSAGES/amarok.mo
share/locale/ja/LC_MESSAGES/amarok.mo
share/locale/ka/LC_MESSAGES/amarok.mo
share/locale/km/LC_MESSAGES/amarok.mo
share/locale/ko/LC_MESSAGES/amarok.mo
share/locale/ku/LC_MESSAGES/amarok.mo
share/locale/lo/LC_MESSAGES/amarok.mo
share/locale/lt/LC_MESSAGES/amarok.mo
share/locale/mk/LC_MESSAGES/amarok.mo
share/locale/ms/LC_MESSAGES/amarok.mo
share/locale/nb/LC_MESSAGES/amarok.mo
share/locale/nds/LC_MESSAGES/amarok.mo
share/locale/ne/LC_MESSAGES/amarok.mo
share/locale/nl/LC_MESSAGES/amarok.mo
share/locale/nn/LC_MESSAGES/amarok.mo
share/locale/pa/LC_MESSAGES/amarok.mo

share/locale/ro/LC_MESSAGES/amarok.mo
share/locale/ru/LC_MESSAGES/amarok.mo
share/locale/rw/LC_MESSAGES/amarok.mo
share/locale/sl/LC_MESSAGES/amarok.mo
share/locale/se/LC_MESSAGES/amarok.mo
share/locale/sk/LC_MESSAGES/amarok.mo
share/locale/sl/LC_MESSAGES/amarok.mo
share/locale/sq/LC_MESSAGES/amarok.mo
share/locale/sr/LC_MESSAGES/amarok.mo
share/locale/sr@Latn/LC_MESSAGES/amarok.mo
share/locale/ss/LC_MESSAGES/amarok.mo
share/locale/sv/LC_MESSAGES/amarok.mo
share/locale/ta/LC_MESSAGES/amarok.mo
share/locale/tg/LC_MESSAGES/amarok.mo

%%GPOD%%share/services/amarok_ipod-mediadevice.desktop
%%MTP%%share/services/amarok_mtp-mediadevice.desktop
%%NJB%%share/services/amarok_njb-mediadevice.desktop
share/services/amarokitpc.protocol
share/services/amaroklastfm.protocol
share/services/amarokpcast.protocol
share/services/amarok_daap-mediadevice.desktop
share/services/amarok_generic-mediadevice.desktop
share/services/amarok_massstorage-device.desktop
share/services/amarok_nfs-device.desktop
share/services/amarok_smb-device.desktop
share/services/amarok_xine-engine.desktop
share/services/amarok_void-engine_plugin.desktop
share/services/amarok_xine-engine.desktop
share/services/amarokitpc.protocol
share/services/amaroklastfm.protocol
share/services/amarokpcast.protocol
share/servicetypes/amarok_codecinstall.desktop
share/servicetypes/amarok_plugin.desktop
@dirrmtry share/locale/zh_TW/LC_MESSAGES
@dirrmtry share/locale/zh_TW
@dirrmtry share/locale/zh_CN/LC_MESSAGES
@dirrmtry share/locale/zh_CN
@dirrmtry share/locale/uz/LC_MESSAGES
@dirrmtry share/locale/uz
@dirrmtry share/locale/uk/LC_MESSAGES
@dirrmtry share/locale/uk
@dirrmtry share/locale/tk/LC_MESSAGES
@dirrmtry share/locale/tk
@dirrmtry share/locale/tg/LC_MESSAGES
@dirrmtry share/locale/tg
@dirrmtry share/locale/ss/LC_MESSAGES
@dirrmtry share/locale/ss
@dirrmtry share/locale/sr/LC_MESSAGES
@dirrmtry share/locale/sr
@dirrmtry share/locale/sl/LC_MESSAGES
@dirrmtry share/locale/sl
@dirrmtry share/locale/sk/LC_MESSAGES
@dirrmtry share/locale/sk
@dirrmtry share/locale/se/LC_MESSAGES
@dirrmtry share/locale/se
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
@dirrmtry share/locale/ro/LC_MESSAGES
@dirrmtry share/locale/ro
@dirrmtry share/locale/pt/LC_MESSAGES
@dirrmtry share/locale/pt
@dirrmtry share/locale/pl/LC_MESSAGES
@dirrmtry share/locale/pl
@dirrmtry share/locale/no/LC_MESSAGES
@dirrmtry share/locale/no
@dirrmtry share/locale/nn/LC_MESSAGES
@dirrmtry share/locale/nn
@dirrmtry share/locale/ne/LC_MESSAGES
@dirrmtry share/locale/ne
@dirrmtry share/locale/nds/LC_MESSAGES
@dirrmtry share/locale/nds
@dirrmtry share/locale/lo/LC_MESSAGES
@dirrmtry share/locale/lo
@dirrmtry share/locale/li/LC_MESSAGES
@dirrmtry share/locale/li
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
@dirrmtry share/locale/ko/LC_MESSAGES
@dirrmtry share/locale/ko
@dirrmtry share/locale/km/LC_MESSAGES
@dirrmtry share/locale/km
@dirrmtry share/locale/gl/LC_MESSAGES
@dirrmtry share/locale/gl
@dirrmtry share/locale/fr_FR/LC_MESSAGES
@dirrmtry share/locale/fr_FR
@dirrmtry share/locale/fi/LC_MESSAGES
@dirrmtry share/locale/fi
@dirrmtry share/locale/fa_IR/LC_MESSAGES
@dirrmtry share/locale/fa_IR
@dirrmtry share/locale/en_AU/LC_MESSAGES
@dirrmtry share/locale/en_AU
@dirrmtry share/locale/el/LC_MESSAGES
@dirrmtry share/locale/el
@dirrmtry share/locale/de_AT/LC_MESSAGES
@dirrmtry share/locale/de_AT
@dirrmtry share/locale/cs/LC_MESSAGES
@dirrmtry share/locale/cs
@dirrmtry share/locale/ca/LC_MESSAGES
@dirrmtry share/locale/ca
@dirrmtry share/locale/be/LC_MESSAGES
@dirrmtry share/locale/be
@dirrm share/doc/HTML/sv/amarok
@dirrmtry share/doc/HTML/sv
@dirrm share/doc/HTML/ru/amarok
@dirrmtry share/doc/HTML/ru
@dirrm share/doc/HTML/pt_BR/amarok
@dirrmtry share/doc/HTML/pt_BR
@dirrm share/doc/HTML/pt/amarok
@dirrmtry share/doc/HTML/pt
@dirrm share/doc/HTML/pl/amarok
@dirrmtry share/doc/HTML/pl
@dirrm share/doc/HTML/nl/amarok
@dirrmtry share/doc/HTML/nl
@dirrm share/doc/HTML/it/amarok
@dirrmtry share/doc/HTML/it
@dirrm share/doc/HTML/fr/amarok
@dirrmtry share/doc/HTML/fr
@dirrm share/doc/HTML/et/amarok
@dirrmtry share/doc/HTML/et
@dirrm share/doc/HTML/es/amarok
@dirrmtry share/doc/HTML/es
@dirrm share/doc/HTML/en/amarok
@dirrmtry share/doc/HTML/en
@dirrm share/doc/HTML/de/amarok
@dirrmtry share/doc/HTML/de
@dirrm share/doc/HTML/da/amarok
@dirrmtry share/doc/HTML/da
@dirrm share/apps/amarok/themes/reinhardt/images
@dirrm share/apps/amarok/themes/reinhardt
@dirrm share/apps/amarok/themes/example

@dirrm share/apps/amarok/ruby_lib/mongrel
@dirrm share/apps/amarok/ruby_lib
@dirrm share/apps/amarok/images
@dirrm share/apps/amarok/icons/crystalsvg/64x64/actions
@dirrm share/apps/amarok/icons/crystalsvg/64x64
@dirrm share/apps/amarok/icons/crystalsvg/22x22/actions
@dirrm share/apps/amarok/icons/crystalsvg/22x22
@dirrm share/apps/amarok/icons/crystalsvg/16x16/actions
@dirrm share/apps/amarok/icons/crystalsvg/16x16
@dirrm share/apps/amarok/icons/crystalsvg
@dirrm share/apps/amarok/icons/hicolor/64x64/actions
@dirrm share/apps/amarok/icons/hicolor/64x64
@dirrm share/apps/amarok/icons/hicolor/48x48/actions

@dirrm share/apps/amarok/icons/hicolor/16x16/actions
@dirrm share/apps/amarok/icons/hicolor/16x16
@dirrm share/apps/amarok/icons/hicolor
@dirrm share/apps/amarok/icons/crystalsvg/64x64/actions
@dirrm share/apps/amarok/icons/crystalsvg/64x64
@dirrm share/apps/amarok/icons/crystalsvg/22x22/actions
@dirrm share/apps/amarok/icons/crystalsvg/22x22
@dirrm share/apps/amarok/icons/crystalsvg/16x16/actions
@dirrm share/apps/amarok/icons/crystalsvg/16x16
@dirrm share/apps/amarok/icons/crystalsvg
@dirrm share/apps/amarok/icons
@dirrm share/apps/amarok/data
@dirrm share/apps/amarok
@dirrmtry lib/ruby_lib

Return to bug 115757

Line 0 Link Here

(-)amarok/files/hide-main-menu-bar-feature.patch (+119 lines)
		1	diff -ruN amarok.orig/src/amarokcore/amarok.kcfg amarok/src/amarokcore/amarok.kcfg
		2	--- amarok.orig/src/amarokcore/amarok.kcfg Mon Jun 18 01:51:49 2007
		3	+++ amarok/src/amarokcore/amarok.kcfg Thu Jun 21 22:42:23 2007
		4	@@ -216,6 +216,11 @@
		5	<whatsthis>Set this to the style dir you want to use.</whatsthis>
		6	<default>Default</default>
		7	</entry>
		8	+ <entry key="Show Menu Bar" type="Bool">
		9	+ <label>Whether Menubar is shown</label>
		10	+ <whatsthis>If set, Amarok displays a menubar on top of the application.</whatsthis>
		11	+ <default>true</default>
		12	+ </entry>
		13	<entry key="Relative Playlist" type="Bool">
		14	<label>Whether playlists store relative path</label>
		15	<whatsthis>If set, Amarok's manually saved playlists will contain a relative path to each track, not an absolute path.</whatsthis>
		16	diff -ruN amarok.orig/src/app.cpp amarok/src/app.cpp
		17	--- amarok.orig/src/app.cpp Mon Jun 18 01:51:49 2007
		18	+++ amarok/src/app.cpp Thu Jun 21 22:43:27 2007
		19	@@ -678,6 +674,11 @@
		20	m_pPlaylistWindow->setCaption( i18n("Amarok - %1").arg( EngineController::instance()->bundle().veryNiceTitle() ) );
		21	else
		22	m_pPlaylistWindow->setCaption( "Amarok" );
		23	+
		24	+ //m_pPlaylistWindow->show(); //must be shown //we do below now
		25	+ //ensure that at least one Menu is plugged into an accessible UI element
		26	+ if( !AmarokConfig::showMenuBar() && !Amarok::actionCollection()->action( "amarok_menu" )->isPlugged() )
		27	+ playlistWindow()->createGUI();
		28	}
		29
		30	playlistWindow()->applySettings();
		31	diff -ruN amarok.orig/src/playlistwindow.cpp amarok/src/playlistwindow.cpp
		32	--- amarok.orig/src/playlistwindow.cpp Mon Jun 18 01:51:49 2007
		33	+++ amarok/src/playlistwindow.cpp Thu Jun 21 22:48:15 2007
		34	@@ -139,6 +139,7 @@
		35	ac->action( "stream_add" )->setIcon( Amarok::icon( "files" ) );
		36	KStdAction::save( this, SLOT(savePlaylist()), ac, "playlist_save" )->setText( i18n("&Save Playlist As...") );
		37	ac->action( "playlist_save" )->setIcon( Amarok::icon( "save" ) );
		38	+ KStdAction::showMenubar( this, SLOT(slotToggleMenu()), ac );
		39
		40	//FIXME: after string freeze rename to "Burn Current Playlist"?
		41	new KAction( i18n("Burn to CD"), Amarok::icon( "burn" ), 0, this, SLOT(slotBurnPlaylist()), ac, "playlist_burn" );
		42	@@ -233,6 +236,7 @@
		43
		44	PlaylistWindow::~PlaylistWindow()
		45	{
		46	+ Amarok::config( "PlaylistWindow" )->writeEntry( "showMenuBar", m_menubar->isShown() );
		47	AmarokConfig::setPlaylistWindowPos( pos() ); //TODO de XT?
		48	AmarokConfig::setPlaylistWindowSize( size() ); //TODO de XT?
		49	}
		50	@@ -307,6 +310,7 @@
		51	connect( repeatAction, SIGNAL( activated( int ) ), playlist, SLOT( slotRepeatTrackToggled( int ) ) );
		52
		53	m_menubar = new KMenuBar( this );
		54	+ m_menubar->setShown( AmarokConfig::showMenuBar() );
		55
		56	//BEGIN Actions menu
		57	KPopupMenu *actionsMenu = new KPopupMenu( m_menubar );
		58	@@ -381,6 +388,8 @@
		59	m_settingsMenu = new KPopupMenu( m_menubar );
		60	//TODO use KStdAction or KMainWindow
		61	#ifndef Q_WS_MAC
		62	+ static_cast<KToggleAction *>(actionCollection()->action(KStdAction::name(KStdAction::ShowMenubar)))->setChecked( AmarokConfig::showMenuBar() );
		63	+ actionCollection()->action(KStdAction::name(KStdAction::ShowMenubar))->plug( m_settingsMenu );
		64	m_settingsMenu->insertItem( AmarokConfig::showToolbar() ? i18n( "Hide Toolbar" ) : i18n("Show Toolbar"), ID_SHOW_TOOLBAR );
65	m_settingsMenu->insertItem( AmarokConfig::showPlayerWindow() ? i18n("Hide Player &Window") : i18n("Show Player &Window"), ID_SHOW_PLAYERWINDOW );
66	m_settingsMenu->insertSeparator();
67	@@ -569,6 +578,12 @@
68	for( QStringList::ConstIterator it = list.constBegin(); it != end; ++it )
69	{
70	KToolBarButton* const button = static_cast<KToolBarButton>( m_toolbar->child( (it).latin1() ) );
71	+ if ( it == last ) {
72	+ //if the user has no PlayerWindow, he MUST have the menu action plugged
73	+ //NOTE this is not saved to the local XMLFile, which is what the user will want
74	+ if ( !AmarokConfig::showPlayerWindow() && !AmarokConfig::showMenuBar() && !button )
75	+ actionCollection()->action( "amarok_menu" )->plug( m_toolbar );
76	+ }
77
78	if ( button ) {
79	button->modeChange();
80	@@ -1031,6 +1046,20 @@
81	Playlist::instance()->setFocus();
82	}
83
84	+void PlaylistWindow::slotToggleMenu() //SLOT
85	+{
86	+ if( static_cast<KToggleAction *>(actionCollection()->action(KStdAction::name(KStdAction::ShowMenubar)))->isChecked() ) {
87	+ AmarokConfig::setShowMenuBar( true );
88	+ m_menubar->setShown( true );
89	+ }
90	+ else
91	+ {
92	+ AmarokConfig::setShowMenuBar( false );
93	+ m_menubar->setShown( false );
94	+ }
95	+ recreateGUI();
96	+}
97	+
98	void PlaylistWindow::slotMenuActivated( int index ) //SLOT
99	{
100	switch( index )
101	@@ -1042,6 +1071,7 @@
102	case ID_SHOW_TOOLBAR:
103	m_toolbar->setShown( !m_toolbar->isShown() );
104	AmarokConfig::setShowToolbar( !AmarokConfig::showToolbar() );
105	+ actionCollection()->action(KStdAction::name(KStdAction::ShowMenubar))->setEnabled( m_toolbar->isShown() );
106	m_settingsMenu->changeItem( index, m_toolbar->isShown() ? i18n("Hide Toolbar") : i18n("Show Toolbar") );
107	break;
108	case ID_SHOW_PLAYERWINDOW:
109	diff -ruN amarok.orig/src/playlistwindow.h amarok/src/playlistwindow.h
110	--- amarok.orig/src/playlistwindow.h Mon Jun 18 01:51:49 2007
111	+++ amarok/src/playlistwindow.h Thu Jun 21 22:48:44 2007
112	@@ -91,6 +91,7 @@
113	void slotMenuActivated( int );
114	void actionsMenuAboutToShow();
115	void toolsMenuAboutToShow();
116	+ void slotToggleMenu();
117	void slotToggleFocus();
118	void slotEditFilter();
119	void slotSetFilter( const QString &filter );

Lines 1-18 Link Here

(-)amarok/files/patch-amarok_src_mediadevice_generic_genericmediadevice.cpp (-18 lines)
1	--- amarok/src/mediadevice/generic/genericmediadevice.cpp.orig Mon Feb 12 23:01:20 2007
2	+++ amarok/src/mediadevice/generic/genericmediadevice.cpp Mon Feb 12 23:01:29 2007
3	@@ -418,13 +418,7 @@
4	if( m_medium.mountPoint() == (*mountiter)->mountPoint() )
5	m_medium.setFsType( (*mountiter)->mountType() );
6	}
7	- m_actuallyVfat = m_medium.fsType() ==
8	-#ifdef __FreeBSD__
9	- "msdosfs"
10	-#else
11	- "vfat"
12	-#endif
13	- ? true : false;
14	+ m_actuallyVfat = (m_medium.fsType() == "vfat" \|\| m_medium.fsType() == "msdosfs") ? true : false;
15	m_connected = true;
16	m_transferDir = m_medium.mountPoint();
17	m_initialFile = new GenericMediaFile( 0, m_medium.mountPoint(), this );
18