aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--audio/juk/Makefile5
-rw-r--r--audio/juk/distinfo2
-rw-r--r--audio/juk/files/patch-juk::collectionlist.cpp13
-rw-r--r--audio/juk/files/patch-juk::genrelisteditorbase.ui38
-rw-r--r--audio/juk/files/patch-juk::juk.cpp19
-rw-r--r--audio/juk/files/patch-juk::juk.h11
-rw-r--r--audio/juk/files/patch-juk::jukui.rc11
-rw-r--r--audio/juk/files/patch-juk::playlist.cpp29
-rw-r--r--audio/juk/files/patch-juk::playlistbox.cpp20
-rw-r--r--audio/juk/files/patch-juk::playlistsplitter.cpp69
-rw-r--r--audio/juk/files/patch-juk::playlistsplitter.h22
-rw-r--r--audio/juk/files/patch-juk::slideraction.cpp11
-rw-r--r--audio/juk/files/patch-juk::tageditor.cpp80
13 files changed, 3 insertions, 327 deletions
diff --git a/audio/juk/Makefile b/audio/juk/Makefile
index 931d006056b1..72958693ae4f 100644
--- a/audio/juk/Makefile
+++ b/audio/juk/Makefile
@@ -6,10 +6,9 @@
#
PORTNAME= juk
-PORTVERSION= 1.0
+PORTVERSION= 1.1
CATEGORIES= audio kde
-MASTER_SITES= http://www.slackorama.net/oss/juk/
-DISTNAME= ${PORTNAME}-${PORTVERSION}-1
+MASTER_SITES= http://developer.kde.org/~wheeler/files/src/
MAINTAINER= kde@FreeBSD.org
COMMENT= JuK, a music manager and jukebox for KDE
diff --git a/audio/juk/distinfo b/audio/juk/distinfo
index 6a25692ed2b9..078030015442 100644
--- a/audio/juk/distinfo
+++ b/audio/juk/distinfo
@@ -1 +1 @@
-MD5 (juk-1.0-1.tar.gz) = 52373efb9db08946437ee2c5ec54a95a
+MD5 (juk-1.1.tar.gz) = bdb8d17d2789f9d6c9f7a56d67f5730f
diff --git a/audio/juk/files/patch-juk::collectionlist.cpp b/audio/juk/files/patch-juk::collectionlist.cpp
deleted file mode 100644
index b466e773d7b2..000000000000
--- a/audio/juk/files/patch-juk::collectionlist.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
---- juk/collectionlist.cpp.orig Sat Feb 15 08:36:32 2003
-+++ juk/collectionlist.cpp Mon Mar 3 12:24:34 2003
-@@ -131,8 +131,8 @@
- {
- if(e->source() == this)
- return;
--
--
-+ else
-+ decode(e);
- }
-
- void CollectionList::contentsDragMoveEvent(QDragMoveEvent *e)
diff --git a/audio/juk/files/patch-juk::genrelisteditorbase.ui b/audio/juk/files/patch-juk::genrelisteditorbase.ui
deleted file mode 100644
index 1d9af928fac5..000000000000
--- a/audio/juk/files/patch-juk::genrelisteditorbase.ui
+++ /dev/null
@@ -1,38 +0,0 @@
---- juk/genrelisteditorbase.ui.orig Mon Dec 9 12:36:24 2002
-+++ juk/genrelisteditorbase.ui Mon Mar 3 12:24:34 2003
-@@ -159,7 +159,7 @@
- <cstring>genreNameLabel</cstring>
- </property>
- <property name="text">
-- <string>Name</string>
-+ <string>Name:</string>
- </property>
- </widget>
- <widget class="KLineEdit">
-@@ -172,7 +172,7 @@
- <cstring>ID3v1Label</cstring>
- </property>
- <property name="text">
-- <string>ID3v1 Genre Mapping</string>
-+ <string>ID3v1 genre mapping:</string>
- </property>
- </widget>
- <widget class="KComboBox">
-@@ -247,7 +247,7 @@
- <cstring>okButton</cstring>
- </property>
- <property name="text">
-- <string>OK</string>
-+ <string>&amp;OK</string>
- </property>
- <property name="autoDefault">
- <bool>true</bool>
-@@ -261,7 +261,7 @@
- <cstring>cancelButton</cstring>
- </property>
- <property name="text">
-- <string>Cancel</string>
-+ <string>&amp;Cancel</string>
- </property>
- </widget>
- </hbox>
diff --git a/audio/juk/files/patch-juk::juk.cpp b/audio/juk/files/patch-juk::juk.cpp
deleted file mode 100644
index 602f5826224c..000000000000
--- a/audio/juk/files/patch-juk::juk.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
---- juk/juk.cpp.orig Tue Feb 18 05:29:20 2003
-+++ juk/juk.cpp Mon Mar 3 12:24:34 2003
-@@ -52,6 +52,7 @@
- readSettings();
- setupLayout();
- setupActions();
-+ playlistChanged();
- readConfig();
- setupPlayer();
- setupSystemTray();
-@@ -84,8 +85,6 @@
-
- connect(splitter, SIGNAL(selectedPlaylistCountChanged(int)), statusLabel, SLOT(setPlaylistCount(int)));
- connect(statusLabel, SIGNAL(jumpButtonClicked()), splitter, SLOT(selectPlaying()));
--
-- updatePlaylistInfo();
-
- splitter->setFocus();
-
diff --git a/audio/juk/files/patch-juk::juk.h b/audio/juk/files/patch-juk::juk.h
deleted file mode 100644
index 1e4815ff380c..000000000000
--- a/audio/juk/files/patch-juk::juk.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- juk/juk.h.orig Tue Feb 18 05:27:09 2003
-+++ juk/juk.h Mon Mar 3 12:24:34 2003
-@@ -84,8 +84,6 @@
- void clear();
- void selectAll();
-
--private slots:
--
- // player menu
- void play();
- void pause();
diff --git a/audio/juk/files/patch-juk::jukui.rc b/audio/juk/files/patch-juk::jukui.rc
deleted file mode 100644
index 82d013635466..000000000000
--- a/audio/juk/files/patch-juk::jukui.rc
+++ /dev/null
@@ -1,11 +0,0 @@
---- juk/jukui.rc.orig Mon Feb 17 08:36:00 2003
-+++ juk/jukui.rc Mon Mar 3 12:24:34 2003
-@@ -15,7 +15,7 @@
- <Separator/>
-
- <Action name="file_save"/>
-- <Action name="file_saveas"/>
-+ <Action name="file_save_as"/>
-
- <Separator/>
-
diff --git a/audio/juk/files/patch-juk::playlist.cpp b/audio/juk/files/patch-juk::playlist.cpp
deleted file mode 100644
index 6ca3906bf66d..000000000000
--- a/audio/juk/files/patch-juk::playlist.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
---- juk/playlist.cpp.orig Mon Feb 17 09:50:48 2003
-+++ juk/playlist.cpp Mon Mar 3 12:24:34 2003
-@@ -215,7 +215,7 @@
- delete it.current();
- }
- else
-- KMessageBox::sorry(this, i18n("Could not save delete ") + it.current()->fileName() + ".");
-+ KMessageBox::sorry(this, i18n("Could not delete ") + it.current()->fileName() + ".");
- }
-
- }
-@@ -483,7 +483,7 @@
-
- _columnVisibleAction = new KActionMenu(i18n("Show Columns"), this, "showColumns");
- headerMenu = _columnVisibleAction->popupMenu();
-- headerMenu->insertTitle(i18n("Show..."));
-+ headerMenu->insertTitle(i18n("Show"));
- headerMenu->setCheckable(true);
-
- for(int i =0; i < header()->count(); ++i) {
-@@ -508,7 +508,7 @@
-
- rmbMenu->insertSeparator();
-
-- rmbMenu->insertItem(SmallIcon("editdelete"), i18n("Remove from disk"), this, SLOT(removeSelectedItems()));
-+ rmbMenu->insertItem(SmallIcon("editdelete"), i18n("Remove From Disk"), this, SLOT(removeSelectedItems()));
-
- rmbMenu->insertSeparator();
-
diff --git a/audio/juk/files/patch-juk::playlistbox.cpp b/audio/juk/files/patch-juk::playlistbox.cpp
deleted file mode 100644
index 909ad3847e81..000000000000
--- a/audio/juk/files/patch-juk::playlistbox.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- juk/playlistbox.cpp.orig Mon Feb 17 04:03:17 2003
-+++ juk/playlistbox.cpp Mon Mar 3 12:24:34 2003
-@@ -129,7 +129,7 @@
-
- bool ok;
-
-- QString name = QInputDialog::getText(i18n("Rename..."), i18n("Please enter a name for this playlist:"),
-+ QString name = QInputDialog::getText(i18n("Rename"), i18n("Please enter a name for this playlist:"),
- QLineEdit::Normal, item->text(), &ok);
- if(ok) {
- item->setText(name);
-@@ -158,7 +158,7 @@
-
- // If this text is changed, please also change it in PlaylistSplitter::createPlaylist().
-
-- QString name = QInputDialog::getText(i18n("New Playlist..."), i18n("Please enter a name for the new playlist:"),
-+ QString name = QInputDialog::getText(i18n("New Playlist"), i18n("Please enter a name for the new playlist:"),
- QLineEdit::Normal, splitter->uniquePlaylistName(item->text(), true), &ok);
- if(ok) {
- Playlist *p = splitter->createPlaylist(name);
diff --git a/audio/juk/files/patch-juk::playlistsplitter.cpp b/audio/juk/files/patch-juk::playlistsplitter.cpp
deleted file mode 100644
index 5d74bf92a8a3..000000000000
--- a/audio/juk/files/patch-juk::playlistsplitter.cpp
+++ /dev/null
@@ -1,69 +0,0 @@
---- juk/playlistsplitter.cpp.orig Mon Feb 17 09:46:30 2003
-+++ juk/playlistsplitter.cpp Mon Mar 3 12:24:34 2003
-@@ -443,7 +443,7 @@
-
- // check to see if we've alredy loaded this item before continuing
-
-- if(!playlistFiles.insert(p->fileName()))
-+ if(p->fileName().isEmpty() || !playlistFiles.insert(p->fileName()))
- setupPlaylist(p);
- else
- delete p;
-@@ -458,19 +458,19 @@
-
- if(collection) {
- // the last column is just a filler
-- _visibleColumns.resize(collection->columns() - 1, true);
-+ m_visibleColumns.resize(collection->columns() - 1, true);
- QValueList<int> l = config->readIntListEntry("VisibleColumns");
-
- uint i = 0;
- for(QValueList<int>::Iterator it = l.begin(); it != l.end(); ++it) {
- if(! bool(*it)) {
-- _visibleColumns[i] = bool(*it);
-+ m_visibleColumns[i] = bool(*it);
- collection->hideColumn(i);
- }
-
-- // while we're looping go ahead and populate _columnNames
-+ // while we're looping go ahead and populate m_columnNames
-
-- _columnNames.append(collection->columnText(i));
-+ m_columnNames.append(collection->columnText(i));
-
- i++;
- }
-@@ -513,8 +513,8 @@
- config->writeEntry("DirectoryList", directoryList);
-
- QValueList<int> l;
-- for(uint i = 0; i < _visibleColumns.size(); i++)
-- l.append(int(_visibleColumns[i]));
-+ for(uint i = 0; i < m_visibleColumns.size(); i++)
-+ l.append(int(m_visibleColumns[i]));
-
- config->writeEntry("VisibleColumns", l);
-
-@@ -583,10 +583,10 @@
- if(!p)
- return;
-
-- for(uint i = 0; i < _visibleColumns.size(); i++) {
-- if(_visibleColumns[i] && ! p->isColumnVisible(i))
-+ for(uint i = 0; i < m_visibleColumns.size(); i++) {
-+ if(m_visibleColumns[i] && ! p->isColumnVisible(i))
- p->showColumn(i);
-- else if(! _visibleColumns[i] && p->isColumnVisible(i))
-+ else if(! m_visibleColumns[i] && p->isColumnVisible(i))
- p->hideColumn(i);
- }
- }
-@@ -619,7 +619,7 @@
-
- void PlaylistSplitter::slotToggleColumnVisible(int column)
- {
-- _visibleColumns[column] = ! _visibleColumns[column];
-+ m_visibleColumns[column] = ! m_visibleColumns[column];
- if(visiblePlaylist())
- setupColumns(visiblePlaylist());
- }
diff --git a/audio/juk/files/patch-juk::playlistsplitter.h b/audio/juk/files/patch-juk::playlistsplitter.h
deleted file mode 100644
index 5e415e7f323e..000000000000
--- a/audio/juk/files/patch-juk::playlistsplitter.h
+++ /dev/null
@@ -1,22 +0,0 @@
---- juk/playlistsplitter.h.orig Mon Feb 17 06:23:26 2003
-+++ juk/playlistsplitter.h Mon Mar 3 12:24:34 2003
-@@ -144,7 +144,7 @@
- */
- void open(const QString &file);
-
-- QStringList columnNames() const { return _columnNames; }
-+ QStringList columnNames() const { return m_columnNames; }
-
- KActionMenu *columnVisibleAction() const { return collection->columnVisibleAction(); }
-
-@@ -300,8 +300,8 @@
- QStringList directoryQueue;
- QStringList directoryQueueRemove;
-
-- QValueVector<bool> _visibleColumns;
-- QStringList _columnNames;
-+ QValueVector<bool> m_visibleColumns;
-+ QStringList m_columnNames;
-
- bool showEditor;
- bool restore;
diff --git a/audio/juk/files/patch-juk::slideraction.cpp b/audio/juk/files/patch-juk::slideraction.cpp
deleted file mode 100644
index e922af7ff361..000000000000
--- a/audio/juk/files/patch-juk::slideraction.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- juk/slideraction.cpp.orig Thu Feb 13 02:51:57 2003
-+++ juk/slideraction.cpp Mon Mar 3 12:24:34 2003
-@@ -122,7 +122,7 @@
-
- trackPositionSlider = new TrackPositionSlider(base, "trackPositionSlider");
- trackPositionSlider->setMaxValue(1000);
-- QToolTip::add(trackPositionSlider, i18n("Track Position"));
-+ QToolTip::add(trackPositionSlider, i18n("Track position"));
- layout->addWidget(trackPositionSlider);
-
- volumeSlider = new QSlider(base, "volumeSlider" );
diff --git a/audio/juk/files/patch-juk::tageditor.cpp b/audio/juk/files/patch-juk::tageditor.cpp
deleted file mode 100644
index c479f935a53b..000000000000
--- a/audio/juk/files/patch-juk::tageditor.cpp
+++ /dev/null
@@ -1,80 +0,0 @@
---- juk/tageditor.cpp.orig Sun Feb 16 06:07:29 2003
-+++ juk/tageditor.cpp Mon Mar 3 12:24:34 2003
-@@ -315,17 +315,17 @@
- { // just for organization
- artistNameBox = new KComboBox(true, this, "artistNameBox");
- artistNameBox->setCompletionMode(KGlobalSettings::CompletionAuto);
-- addItem(i18n("Artist Name"), artistNameBox, leftColumnLayout);
-+ addItem(i18n("Artist name:"), artistNameBox, leftColumnLayout);
-
- trackNameBox = new KLineEdit(this, "trackNameBox");
-- addItem(i18n("Track Name"), trackNameBox, leftColumnLayout);
-+ addItem(i18n("Track name:"), trackNameBox, leftColumnLayout);
-
- albumNameBox = new KComboBox(true, this, "albumNameBox");
- albumNameBox->setCompletionMode(KGlobalSettings::CompletionAuto);
-- addItem(i18n("Album Name"), albumNameBox, leftColumnLayout);
-+ addItem(i18n("Album name:"), albumNameBox, leftColumnLayout);
-
- genreBox = new KComboBox(true, this, "genreBox");
-- addItem(i18n("Genre"), genreBox, leftColumnLayout);
-+ addItem(i18n("Genre:"), genreBox, leftColumnLayout);
-
- // this fills the space at the bottem of the left column
- leftColumnLayout->addItem(new QSpacerItem(0, 0, QSizePolicy::Minimum, QSizePolicy::Expanding));
-@@ -334,7 +334,7 @@
- // put stuff in the right column
- //////////////////////////////////////////////////////////////////////////////
- { // just for organization
-- rightColumnLayout->addWidget(new QLabel(i18n("File Name"), this));
-+ rightColumnLayout->addWidget(new QLabel(i18n("File name:"), this));
-
- fileNameBox = new KLineEdit(this, "fileNameBox");
- rightColumnLayout->addWidget(fileNameBox);
-@@ -343,16 +343,16 @@
- QHBoxLayout *trackRowLayout = new QHBoxLayout(rightColumnLayout, horizontalSpacing);
-
- trackSpin = new KIntSpinBox(0, 255, 1, 0, 10, this, "trackSpin");
-- addItem("Track", trackSpin, trackRowLayout);
-+ addItem(i18n("Track:"), trackSpin, trackRowLayout);
-
- trackRowLayout->addItem(new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum));
-
- yearSpin = new KIntSpinBox(0, 9999, 1, 0, 10, this, "yearSpin");
-- addItem(i18n("Year"), yearSpin, trackRowLayout);
-+ addItem(i18n("Year:"), yearSpin, trackRowLayout);
-
- trackRowLayout->addItem(new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum));
-
-- trackRowLayout->addWidget(new QLabel(i18n("Length"), this));
-+ trackRowLayout->addWidget(new QLabel(i18n("Length:"), this));
- lengthBox = new KLineEdit(this, "lengthBox");
- lengthBox->setMaximumWidth(50);
- lengthBox->setReadOnly(true);
-@@ -360,7 +360,7 @@
-
- trackRowLayout->addItem(new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum));
-
-- trackRowLayout->addWidget(new QLabel(i18n("Bitrate"), this));
-+ trackRowLayout->addWidget(new QLabel(i18n("Bitrate:"), this));
- bitrateBox = new KLineEdit(this, "bitrateBox");
- bitrateBox->setMaximumWidth(50);
- bitrateBox->setReadOnly(true);
-@@ -369,7 +369,7 @@
-
- commentBox = new KEdit(this, "commentBox");
- commentBox->setTextFormat(Qt::PlainText);
-- addItem(i18n("Comment"), commentBox, rightColumnLayout);
-+ addItem(i18n("Comment:"), commentBox, rightColumnLayout);
- }
-
- connect(artistNameBox, SIGNAL(textChanged(const QString&)), this, SIGNAL(changed()));
-@@ -463,7 +463,7 @@
- if(!errorFiles.isEmpty())
- KMessageBox::detailedSorry(this,
- i18n("Could not save to specified file(s)."),
-- i18n("Could not write to:\n") + errorFiles.join("\n"));
-+ i18n("Could Not Write to:\n") + errorFiles.join("\n"));
- dataChanged = false;
-
- KApplication::restoreOverrideCursor();
generated by cgit (git 2.34.1) at 2024-11-18 10:33:58 +0800