Christophe Marin 2024-11-20 12:31:15 +00:00 committed by Git OBS Bridge
commit 68f3e01023
9 changed files with 1286 additions and 0 deletions

23
.gitattributes vendored Normal file
View File

@ -0,0 +1,23 @@
## Default LFS
*.7z filter=lfs diff=lfs merge=lfs -text
*.bsp filter=lfs diff=lfs merge=lfs -text
*.bz2 filter=lfs diff=lfs merge=lfs -text
*.gem filter=lfs diff=lfs merge=lfs -text
*.gz filter=lfs diff=lfs merge=lfs -text
*.jar filter=lfs diff=lfs merge=lfs -text
*.lz filter=lfs diff=lfs merge=lfs -text
*.lzma filter=lfs diff=lfs merge=lfs -text
*.obscpio filter=lfs diff=lfs merge=lfs -text
*.oxt filter=lfs diff=lfs merge=lfs -text
*.pdf filter=lfs diff=lfs merge=lfs -text
*.png filter=lfs diff=lfs merge=lfs -text
*.rpm filter=lfs diff=lfs merge=lfs -text
*.tbz filter=lfs diff=lfs merge=lfs -text
*.tbz2 filter=lfs diff=lfs merge=lfs -text
*.tgz filter=lfs diff=lfs merge=lfs -text
*.ttf filter=lfs diff=lfs merge=lfs -text
*.txz filter=lfs diff=lfs merge=lfs -text
*.whl filter=lfs diff=lfs merge=lfs -text
*.xz filter=lfs diff=lfs merge=lfs -text
*.zip filter=lfs diff=lfs merge=lfs -text
*.zst filter=lfs diff=lfs merge=lfs -text

1
.gitignore vendored Normal file
View File

@ -0,0 +1 @@
.osc

14
_service Normal file
View File

@ -0,0 +1,14 @@
<services>
<service name="obs_scm" mode="disabled">
<param name="changesgenerate">enable</param>
<param name="versionformat">2.0.18git.%ci~%h</param>
<param name="url">https://invent.kde.org/multimedia/kaffeine.git</param>
<param name="scm">git</param>
</service>
<service name="set_version" mode="disabled" />
<service name="tar" mode="buildtime"/>
<service name="recompress" mode="buildtime">
<param name="file">*.tar</param>
<param name="compression">xz</param>
</service>
</services>

4
_servicedata Normal file
View File

@ -0,0 +1,4 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://invent.kde.org/multimedia/kaffeine.git</param>
<param name="changesrevision">afc6c121b8cb23c0b1f14ab3c2dd04918d28cc05</param></service></servicedata>

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:02af3951da3c41ef169c13e37cbd2c2832b089ca54b07ce9d64fb3c98a39b6ae
size 13516301

View File

@ -0,0 +1,96 @@
diff --git a/src/playlist/playlisttab.cpp b/src/playlist/playlisttab.cpp
index 01f1290..6ae454b 100644
--- a/src/playlist/playlisttab.cpp
+++ b/src/playlist/playlisttab.cpp
@@ -25,6 +25,7 @@
#include <QAction>
#include <QBoxLayout>
#include <QFileDialog>
+#include <QToolBar>
#include <QKeyEvent>
#include <QListView>
#include <QMenu>
@@ -446,33 +447,35 @@ PlaylistTab::PlaylistTab(QMenu *menu, KActionCollection *collection, MediaWidget
QBoxLayout *sideLayout = new QVBoxLayout(widget);
sideLayout->setMargin(0);
+ QToolBar *ToolBarLayout= new QToolBar();
QBoxLayout *boxLayout = new QHBoxLayout();
QToolButton *toolButton = new QToolButton(widget);
toolButton->setDefaultAction(newAction);
toolButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
- boxLayout->addWidget(toolButton);
+ ToolBarLayout->addWidget(toolButton);
toolButton = new QToolButton(widget);
toolButton->setDefaultAction(renameAction);
toolButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
- boxLayout->addWidget(toolButton);
+ ToolBarLayout->addWidget(toolButton);
toolButton = new QToolButton(widget);
toolButton->setDefaultAction(removePlaylistAction);
toolButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
- boxLayout->addWidget(toolButton);
+ ToolBarLayout->addWidget(toolButton);
toolButton = new QToolButton(widget);
toolButton->setDefaultAction(savePlaylistAction);
toolButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
- boxLayout->addWidget(toolButton);
+ ToolBarLayout->addWidget(toolButton);
toolButton = new QToolButton(widget);
toolButton->setDefaultAction(savePlaylistAsAction);
toolButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
- boxLayout->addWidget(toolButton);
+ ToolBarLayout->addWidget(toolButton);
+ boxLayout->addWidget(ToolBarLayout);
boxLayout->addStretch();
sideLayout->addLayout(boxLayout);
@@ -499,28 +502,30 @@ PlaylistTab::PlaylistTab(QMenu *menu, KActionCollection *collection, MediaWidget
sideLayout = new QVBoxLayout(widget);
sideLayout->setMargin(0);
+ ToolBarLayout= new QToolBar();
boxLayout = new QHBoxLayout();
toolButton = new QToolButton(widget);
toolButton->setDefaultAction(repeatAction);
toolButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
- boxLayout->addWidget(toolButton);
+ ToolBarLayout->addWidget(toolButton);
toolButton = new QToolButton(widget);
toolButton->setDefaultAction(randomAction);
toolButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
- boxLayout->addWidget(toolButton);
+ ToolBarLayout->addWidget(toolButton);
toolButton = new QToolButton(widget);
toolButton->setDefaultAction(removeTrackAction);
toolButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
- boxLayout->addWidget(toolButton);
+ ToolBarLayout->addWidget(toolButton);
toolButton = new QToolButton(widget);
toolButton->setDefaultAction(clearAction);
toolButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
- boxLayout->addWidget(toolButton);
+ ToolBarLayout->addWidget(toolButton);
+ boxLayout->addWidget(ToolBarLayout);
boxLayout->addStretch();
sideLayout->addLayout(boxLayout);
@@ -615,6 +620,7 @@ void PlaylistTab::createFileWidget()
fileWidget->setFilter(MediaWidget::extensionFilter());
fileWidget->setMode(KFile::Files | KFile::ExistingOnly);
fileWidgetSplitter->setStretchFactor(1, 1);
+ fileWidget->setMinimumWidth(40);
// KFileWidget creates a QUrlComboBox without layout (!), which steals the focus:
// kDebug() << QApplication::focusWidget();

1048
kaffeine.changes Normal file

File diff suppressed because it is too large Load Diff

4
kaffeine.obsinfo Normal file
View File

@ -0,0 +1,4 @@
name: kaffeine
version: 2.0.18git.20230531T022124~afc6c12
mtime: 1685499684
commit: afc6c121b8cb23c0b1f14ab3c2dd04918d28cc05

93
kaffeine.spec Normal file
View File

@ -0,0 +1,93 @@
#
# spec file for package kaffeine
#
# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
Name: kaffeine
Version: 2.0.18git.20230531T022124~afc6c12
Release: 0
Summary: VLC-based Multimedia Player
License: GPL-2.0-or-later
URL: https://apps.kde.org/kaffeine/
Source0: %{name}-%{version}.tar.xz
# PATCH-FEATURE-OPENSUSE kaffeine-fixsplitter.patch -- GUI improvement (allow more flexibly set splitters)
Patch0: kaffeine-fixsplitter.patch
BuildRequires: extra-cmake-modules
BuildRequires: hicolor-icon-theme
BuildRequires: pkgconfig
BuildRequires: cmake(KF5CoreAddons)
BuildRequires: cmake(KF5DBusAddons)
BuildRequires: cmake(KF5DocTools)
BuildRequires: cmake(KF5I18n)
BuildRequires: cmake(KF5KIO)
BuildRequires: cmake(KF5Solid)
BuildRequires: cmake(KF5WidgetsAddons)
BuildRequires: cmake(KF5WindowSystem)
BuildRequires: cmake(KF5XmlGui)
BuildRequires: pkgconfig(Qt5Core)
BuildRequires: pkgconfig(Qt5Network)
BuildRequires: pkgconfig(Qt5Sql)
BuildRequires: pkgconfig(Qt5Widgets)
BuildRequires: pkgconfig(Qt5X11Extras)
BuildRequires: pkgconfig(libdvbv5)
BuildRequires: pkgconfig(libvlc) >= 3.0
BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(xscrnsaver)
Requires: libQt5Sql5-sqlite
Requires: vlc-noX
Recommends: vlc-codecs
%description
Kaffeine is a media player.
What makes it different from the others is its excellent support of digital TV (DVB).
Kaffeine has a user-friendly interface so that even first-time users can start immediately
playing their movies: from DVD (including DVD menus, titles, chapters, etc.), VCD, or a file.
%lang_package
%prep
%autosetup -p1
%build
%cmake_kf5 -d build
%cmake_build
%install
%kf5_makeinstall -C build
%find_lang %{name}
%{kf5_find_htmldocs}
%files
%license COPYING
%doc README.md
%doc %lang(en) %{_kf5_htmldir}/en/kaffeine/
%{_kf5_applicationsdir}/org.kde.kaffeine.desktop
%{_kf5_appstreamdir}/org.kde.kaffeine.appdata.xml
%{_kf5_bindir}/kaffeine
%{_kf5_iconsdir}/hicolor/*/*/*
%{_kf5_mandir}/man1/kaffeine.1%{?ext_man}
%{_kf5_sharedir}/kaffeine/
%{_kf5_sharedir}/solid/actions/
%files lang -f %{name}.lang
%{_kf5_mandir}/*/man1/kaffeine.1%{?ext_man}
%{_kf5_htmldir}/*/kaffeine/
%exclude %{_kf5_htmldir}/en/
%changelog