Репозиторий Sisyphus
Последнее обновление: 1 октября 2023 | Пакетов: 18631 | Посещений: 37510548
en ru br
Репозитории ALT

Группа :: Видео
Пакет: kde5-kaffeine

 Главная   Изменения   Спек   Патчи   Sources   Загрузить   Gear   Bugs and FR  Repocop 

Патч: remove-playing-videoCD.patch
Скачать


diff -ruN kde5-kaffeine/src/mainwindow.cpp new_kde5-kaffeine/src/mainwindow.cpp
--- kde5-kaffeine/src/mainwindow.cpp	2018-11-09 11:14:48.440817992 +0300
+++ new_kde5-kaffeine/src/mainwindow.cpp	2018-11-09 11:02:39.889902812 +0300
@@ -123,20 +123,14 @@
 	connect(button, SIGNAL(clicked()), mainWindow, SLOT(openAudioCd()));
 	gridLayout->addWidget(button, 0, 1);
 
-	button = addShortcut(i18n("&3 Play Video CD"), QIcon::fromTheme(QLatin1String("media-optical"), QIcon(":media-optical-video")), this);
-	button->setShortcut(Qt::Key_3);
-	button->setWhatsThis(i18n("Start playing a Video CD. It assumes that the CD is already there at the CD drive"));
-	connect(button, SIGNAL(clicked()), mainWindow, SLOT(openVideoCd()));
-	gridLayout->addWidget(button, 0, 2);
-
-	button = addShortcut(i18n("&4 Play DVD"), QIcon::fromTheme(QLatin1String("media-optical"), QIcon(":media-optical")), this);
+	button = addShortcut(i18n("&3 Play DVD"), QIcon::fromTheme(QLatin1String("media-optical"), QIcon(":media-optical")), this);
 	button->setShortcut(Qt::Key_4);
 	button->setWhatsThis(i18n("Start playing a DVD. It assumes that the DVD is already there at the DVD drive"));
 	connect(button, SIGNAL(clicked()), mainWindow, SLOT(openDvd()));
 	gridLayout->addWidget(button, 1, 0);
 
 #if HAVE_DVB == 1
-	button = addShortcut(i18n("&5 Digital TV"), QIcon::fromTheme(QLatin1String("video-television"), QIcon(":video-television")), this);
+	button = addShortcut(i18n("&4 Digital TV"), QIcon::fromTheme(QLatin1String("video-television"), QIcon(":video-television")), this);
 	button->setShortcut(Qt::Key_5);
 	button->setWhatsThis("Open the Digital TV live view window. If the TV channels are already scanned, it will start playing the last channel");
 	connect(button, SIGNAL(clicked()), mainWindow, SLOT(playDvb()));
@@ -227,10 +221,6 @@
 	connect(action, SIGNAL(triggered(bool)), this, SLOT(openAudioCd()));
 	menu->addAction(collection->addAction(QLatin1String("file_play_audiocd"), action));
 
-	action = new QAction(QIcon::fromTheme(QLatin1String("media-optical"), QIcon(":media-optical-video")), i18n("Play Video CD"), collection);
-	connect(action, SIGNAL(triggered(bool)), this, SLOT(openVideoCd()));
-	menu->addAction(collection->addAction(QLatin1String("file_play_videocd"), action));
-
 	action = new QAction(QIcon::fromTheme(QLatin1String("media-optical"), QIcon(":media-optical")), i18n("Play DVD"), collection);
 	connect(action, SIGNAL(triggered(bool)), this, SLOT(openDvd()));
 	menu->addAction(collection->addAction(QLatin1String("file_play_dvd"), action));
@@ -353,10 +343,6 @@
 	connect(action, SIGNAL(triggered(bool)), this, SLOT(openAudioCd()));
 	menu->addAction(action);
 
-	action = new QAction(i18n("Play &Video CD"), this);
-	connect(action, SIGNAL(triggered(bool)), this, SLOT(openVideoCd()));
-	menu->addAction(action);
-
 	action = new QAction(i18n("Play &DVD"), this);
 	connect(action, SIGNAL(triggered(bool)), this, SLOT(openDvd()));
 	menu->addAction(action);
@@ -472,7 +458,6 @@
 	parser->addOption(QCommandLineOption(QStringList() << QLatin1String("m") << QLatin1String("minimal"), i18n("Start in minimal mode")));
 	parser->addOption(QCommandLineOption(QStringList() << QLatin1String("t") << QLatin1String("alwaysontop"), i18n("Start with always on top")));
 	parser->addOption(QCommandLineOption(QStringList() << QLatin1String("audiocd"), i18n("Play Audio CD")));
-	parser->addOption(QCommandLineOption(QStringList() << QLatin1String("videocd"), i18n("Play Video CD")));
 	parser->addOption(QCommandLineOption(QStringList() << QLatin1String("dvd"), i18n("Play DVD")));
 
 #if HAVE_DVB == 1
@@ -495,15 +480,6 @@
 		return;
 	}
 
-	if (parser->isSet("videocd")) {
-		if (parser->positionalArguments().count() > 0) {
-			openVideoCd(parser->positionalArguments().first());
-		} else {
-			openVideoCd();
-		}
-		return;
-	}
-
 	if (parser->isSet("dvd")) {
 		if (parser->positionalArguments().count() > 0) {
 			openDvd(parser->positionalArguments().first());
@@ -709,15 +685,6 @@
 	mediaWidget->playAudioCd(device);
 }
 
-void MainWindow::openVideoCd(const QString &device)
-{
-	if (isMinimized())
-		showNormal();
-
-	activateTab(PlayerTabId);
-	mediaWidget->playVideoCd(device);
-}
-
 void MainWindow::openDvd(const QString &device)
 {
 	if (isMinimized())
diff -ruN kde5-kaffeine/src/mainwindow.h new_kde5-kaffeine/src/mainwindow.h
--- kde5-kaffeine/src/mainwindow.h	2018-11-09 11:14:48.440817992 +0300
+++ new_kde5-kaffeine/src/mainwindow.h	2018-11-09 11:16:08.213699211 +0300
@@ -56,7 +56,6 @@
 	void openUrl();
 	void openUrl(const QUrl &url);
 	void openAudioCd(const QString &device = QString());
-	void openVideoCd(const QString &device = QString());
 	void openDvd(const QString &device = QString());
 	void playDvdFolder();
 	void playDvb();
 
дизайн и разработка: Vladimir Lettiev aka crux © 2004-2005, Andrew Avramenko aka liks © 2007-2008
текущий майнтейнер: Michael Shigorin