diff options
Diffstat (limited to 'multimedia')
-rw-r--r-- | multimedia/kplayer-kde4/files/patch-kplayerproperties.h | 11 | ||||
-rw-r--r-- | multimedia/kplayer-kde4/files/patch-kplayerpropertiesdialog.cpp | 112 | ||||
-rw-r--r-- | multimedia/kplayer-kde4/files/patch-kplayersettings.h | 11 | ||||
-rw-r--r-- | multimedia/kplayer-kde4/files/patch-kplayersettingsdialog.cpp | 29 | ||||
-rw-r--r-- | multimedia/kplayer-kde4/pkg-plist | 2 | ||||
-rw-r--r-- | multimedia/kplayer/files/patch-kplayerproperties.h | 11 | ||||
-rw-r--r-- | multimedia/kplayer/files/patch-kplayerpropertiesdialog.cpp | 112 | ||||
-rw-r--r-- | multimedia/kplayer/files/patch-kplayersettings.h | 11 | ||||
-rw-r--r-- | multimedia/kplayer/files/patch-kplayersettingsdialog.cpp | 29 | ||||
-rw-r--r-- | multimedia/kplayer/pkg-plist | 2 |
10 files changed, 326 insertions, 4 deletions
diff --git a/multimedia/kplayer-kde4/files/patch-kplayerproperties.h b/multimedia/kplayer-kde4/files/patch-kplayerproperties.h new file mode 100644 index 000000000000..c9db6de3e5fe --- /dev/null +++ b/multimedia/kplayer-kde4/files/patch-kplayerproperties.h @@ -0,0 +1,11 @@ +--- kplayer/kplayerproperties.h.orig Sat Oct 16 01:58:03 2004 ++++ kplayer/kplayerproperties.h Sat Oct 16 01:58:43 2004 +@@ -349,7 +349,7 @@ + // Advanced properties + + QString executablePathValue (void) const +- { return m_executable_path.isEmpty() ? "mplayer" : m_executable_path; } ++ { return m_executable_path.isEmpty() ? QString::fromLatin1("mplayer") : m_executable_path; } + void setExecutablePathValue (QString path) + { m_executable_path = path; } + diff --git a/multimedia/kplayer-kde4/files/patch-kplayerpropertiesdialog.cpp b/multimedia/kplayer-kde4/files/patch-kplayerpropertiesdialog.cpp new file mode 100644 index 000000000000..e67ac1c665a9 --- /dev/null +++ b/multimedia/kplayer-kde4/files/patch-kplayerpropertiesdialog.cpp @@ -0,0 +1,112 @@ +--- kplayer/kplayerpropertiesdialog.cpp.orig Sat Oct 16 02:14:58 2004 ++++ kplayer/kplayerpropertiesdialog.cpp Sat Oct 16 02:13:17 2004 +@@ -153,7 +153,7 @@ + config -> deleteEntry ("Properties Dialog Page"); + else + config -> writeEntry ("Properties Dialog Page", name); +- setHelp (name.isEmpty() ? "properties" : "properties-" + name); ++ setHelp (name.isEmpty() ? QString::fromLatin1("properties") : "properties-" + name); + } + + void KPlayerPropertiesDialog::slotOk (void) +@@ -191,8 +191,8 @@ + c_name -> setText (m_properties -> name()); + c_playlist -> setCurrentItem (m_properties -> playlistOption()); + c_length -> setText (timeString (m_properties -> length())); +- c_original_width -> setText (m_properties -> originalSize().isEmpty() ? "" : QString::number (m_properties -> originalSize().width())); +- c_original_height -> setText (m_properties -> originalSize().isEmpty() ? "" : QString::number (m_properties -> originalSize().height())); ++ c_original_width -> setText (m_properties -> originalSize().isEmpty() ? QString::fromLatin1("") : QString::number (m_properties -> originalSize().width())); ++ c_original_height -> setText (m_properties -> originalSize().isEmpty() ? QString::fromLatin1("") : QString::number (m_properties -> originalSize().height())); + c_display_size -> setCurrentItem (m_properties -> displaySizeOption()); + displaySizeChanged (c_display_size -> currentItem()); + c_maintain_aspect -> setCurrentItem (m_properties -> maintainAspectOption() + 1); +@@ -266,7 +266,7 @@ + + void KPlayerPropertiesSubtitles::autoloadChanged (int option) + { +- c_url -> setText (option < 2 || m_properties -> subtitleUrl().isEmpty() ? "" ++ c_url -> setText (option < 2 || m_properties -> subtitleUrl().isEmpty() ? QString::fromLatin1("") + : m_properties -> subtitleUrl().isLocalFile() ? m_properties -> subtitleUrl().path() + : m_properties -> subtitleUrl().url()); + c_url -> setEnabled (option == 2); +@@ -274,7 +274,7 @@ + + void KPlayerPropertiesSubtitles::positionChanged (int option) + { +- c_position -> setText (option > 0 ? QString::number (m_properties -> subtitlePositionValue()) : ""); ++ c_position -> setText (option > 0 ? QString::number (m_properties -> subtitlePositionValue()) : QString::fromLatin1("")); + c_position -> setEnabled (option > 0); + if ( option > 0 && sender() ) + { +@@ -285,7 +285,7 @@ + + void KPlayerPropertiesSubtitles::delayChanged (int option) + { +- c_delay -> setText (option > 0 ? QString::number (m_properties -> subtitleDelayValue()) : ""); ++ c_delay -> setText (option > 0 ? QString::number (m_properties -> subtitleDelayValue()) : QString::fromLatin1("")); + c_delay -> setEnabled (option > 0); + if ( option > 0 && sender() ) + { +@@ -348,7 +348,7 @@ + + void KPlayerPropertiesAudio::volumeChanged (int option) + { +- c_volume -> setText (option > 0 ? QString::number (m_properties -> volumeValue()) : ""); ++ c_volume -> setText (option > 0 ? QString::number (m_properties -> volumeValue()) : QString::fromLatin1("")); + c_volume -> setEnabled (option > 0); + if ( option > 0 && sender() ) + { +@@ -359,7 +359,7 @@ + + void KPlayerPropertiesAudio::delayChanged (int option) + { +- c_delay -> setText (option > 0 ? QString::number (m_properties -> audioDelayValue()) : ""); ++ c_delay -> setText (option > 0 ? QString::number (m_properties -> audioDelayValue()) : QString::fromLatin1("")); + c_delay -> setEnabled (option > 0); + if ( option > 0 && sender() ) + { +@@ -441,7 +441,7 @@ + + void KPlayerPropertiesVideo::contrastChanged (int option) + { +- c_contrast -> setText (option > 0 ? QString::number (m_properties -> contrastValue()) : ""); ++ c_contrast -> setText (option > 0 ? QString::number (m_properties -> contrastValue()) : QString::fromLatin1("")); + c_contrast -> setEnabled (option > 0); + if ( option > 0 && sender() ) + { +@@ -452,7 +452,7 @@ + + void KPlayerPropertiesVideo::brightnessChanged (int option) + { +- c_brightness -> setText (option > 0 ? QString::number (m_properties -> brightnessValue()) : ""); ++ c_brightness -> setText (option > 0 ? QString::number (m_properties -> brightnessValue()) : QString::fromLatin1("")); + c_brightness -> setEnabled (option > 0); + if ( option > 0 && sender() ) + { +@@ -463,7 +463,7 @@ + + void KPlayerPropertiesVideo::hueChanged (int option) + { +- c_hue -> setText (option > 0 ? QString::number (m_properties -> hueValue()) : ""); ++ c_hue -> setText (option > 0 ? QString::number (m_properties -> hueValue()) : QString::fromLatin1("")); + c_hue -> setEnabled (option > 0); + if ( option > 0 && sender() ) + { +@@ -474,7 +474,7 @@ + + void KPlayerPropertiesVideo::saturationChanged (int option) + { +- c_saturation -> setText (option > 0 ? QString::number (m_properties -> saturationValue()) : ""); ++ c_saturation -> setText (option > 0 ? QString::number (m_properties -> saturationValue()) : QString::fromLatin1("")); + c_saturation -> setEnabled (option > 0); + if ( option > 0 && sender() ) + { +@@ -524,7 +524,7 @@ + + void KPlayerPropertiesAdvanced::commandLineChanged (int option) + { +- c_command_line -> setText (option > 0 ? m_properties -> commandLineValue() : ""); ++ c_command_line -> setText (option > 0 ? m_properties -> commandLineValue() : QString::fromLatin1("")); + c_command_line -> setEnabled (option > 0); + if ( option > 0 && sender() ) + { diff --git a/multimedia/kplayer-kde4/files/patch-kplayersettings.h b/multimedia/kplayer-kde4/files/patch-kplayersettings.h new file mode 100644 index 000000000000..da34272e09c3 --- /dev/null +++ b/multimedia/kplayer-kde4/files/patch-kplayersettings.h @@ -0,0 +1,11 @@ +--- kplayer/kplayersettings.h.orig Sat Oct 16 02:00:48 2004 ++++ kplayer/kplayersettings.h Sat Oct 16 02:01:22 2004 +@@ -982,7 +982,7 @@ + } + + QString executablePathDefault (void) const +- { return m_executable_path_default.isEmpty() ? "mplayer" : m_executable_path_default; } ++ { return m_executable_path_default.isEmpty() ? QString::fromLatin1("mplayer") : m_executable_path_default; } + void setExecutablePathDefault (QString path) + { m_executable_path_default = path; } + diff --git a/multimedia/kplayer-kde4/files/patch-kplayersettingsdialog.cpp b/multimedia/kplayer-kde4/files/patch-kplayersettingsdialog.cpp new file mode 100644 index 000000000000..5cc882a58ec6 --- /dev/null +++ b/multimedia/kplayer-kde4/files/patch-kplayersettingsdialog.cpp @@ -0,0 +1,29 @@ +--- kplayer/kplayersettingsdialog.cpp.orig Sat Oct 16 02:16:39 2004 ++++ kplayer/kplayersettingsdialog.cpp Sat Oct 16 02:17:35 2004 +@@ -271,7 +271,7 @@ + config -> deleteEntry ("Settings Dialog Page"); + else + config -> writeEntry ("Settings Dialog Page", name); +- setHelp (name.isEmpty() ? "settings" : "settings-" + name); ++ setHelp (name.isEmpty() ? QString::fromLatin1("settings") : "settings-" + name); + } + + void KPlayerSettingsDialog::slotOk (void) +@@ -435,7 +435,7 @@ + KPlayerSettings* settings = kPlayerSettings(); + c_driver_fallback -> setChecked (index > 0 && settings -> audioDriverFallbackDefault()); + c_driver_fallback -> setEnabled (index > 0); +- c_device -> setText (index > 0 ? settings -> audioDeviceDefault() : ""); ++ c_device -> setText (index > 0 ? settings -> audioDeviceDefault() : QString::fromLatin1("")); + c_device -> setEnabled (index > 0); + } + +@@ -792,7 +792,7 @@ + KPlayerSettings* settings = kPlayerSettings(); + c_driver_fallback -> setChecked (index > 0 && settings -> videoDriverFallbackDefault()); + c_driver_fallback -> setEnabled (index > 0); +- c_device -> setText (index > 0 ? settings -> videoDeviceDefault() : ""); ++ c_device -> setText (index > 0 ? settings -> videoDeviceDefault() : QString::fromLatin1("")); + c_device -> setEnabled (index > 0); + } + diff --git a/multimedia/kplayer-kde4/pkg-plist b/multimedia/kplayer-kde4/pkg-plist index c27dbc135c7e..cb029ab245a1 100644 --- a/multimedia/kplayer-kde4/pkg-plist +++ b/multimedia/kplayer-kde4/pkg-plist @@ -137,8 +137,6 @@ share/locale/it/LC_MESSAGES/kplayer.mo share/locale/pl/LC_MESSAGES/kplayer.mo share/locale/ru/LC_MESSAGES/kplayer.mo share/locale/zh_CN/LC_MESSAGES/kplayer.mo -share/nls/POSIX -share/nls/en_US.US-ASCII share/services/kfile_kplayer.desktop share/services/kplayerpart.desktop share/services/mms.protocol diff --git a/multimedia/kplayer/files/patch-kplayerproperties.h b/multimedia/kplayer/files/patch-kplayerproperties.h new file mode 100644 index 000000000000..c9db6de3e5fe --- /dev/null +++ b/multimedia/kplayer/files/patch-kplayerproperties.h @@ -0,0 +1,11 @@ +--- kplayer/kplayerproperties.h.orig Sat Oct 16 01:58:03 2004 ++++ kplayer/kplayerproperties.h Sat Oct 16 01:58:43 2004 +@@ -349,7 +349,7 @@ + // Advanced properties + + QString executablePathValue (void) const +- { return m_executable_path.isEmpty() ? "mplayer" : m_executable_path; } ++ { return m_executable_path.isEmpty() ? QString::fromLatin1("mplayer") : m_executable_path; } + void setExecutablePathValue (QString path) + { m_executable_path = path; } + diff --git a/multimedia/kplayer/files/patch-kplayerpropertiesdialog.cpp b/multimedia/kplayer/files/patch-kplayerpropertiesdialog.cpp new file mode 100644 index 000000000000..e67ac1c665a9 --- /dev/null +++ b/multimedia/kplayer/files/patch-kplayerpropertiesdialog.cpp @@ -0,0 +1,112 @@ +--- kplayer/kplayerpropertiesdialog.cpp.orig Sat Oct 16 02:14:58 2004 ++++ kplayer/kplayerpropertiesdialog.cpp Sat Oct 16 02:13:17 2004 +@@ -153,7 +153,7 @@ + config -> deleteEntry ("Properties Dialog Page"); + else + config -> writeEntry ("Properties Dialog Page", name); +- setHelp (name.isEmpty() ? "properties" : "properties-" + name); ++ setHelp (name.isEmpty() ? QString::fromLatin1("properties") : "properties-" + name); + } + + void KPlayerPropertiesDialog::slotOk (void) +@@ -191,8 +191,8 @@ + c_name -> setText (m_properties -> name()); + c_playlist -> setCurrentItem (m_properties -> playlistOption()); + c_length -> setText (timeString (m_properties -> length())); +- c_original_width -> setText (m_properties -> originalSize().isEmpty() ? "" : QString::number (m_properties -> originalSize().width())); +- c_original_height -> setText (m_properties -> originalSize().isEmpty() ? "" : QString::number (m_properties -> originalSize().height())); ++ c_original_width -> setText (m_properties -> originalSize().isEmpty() ? QString::fromLatin1("") : QString::number (m_properties -> originalSize().width())); ++ c_original_height -> setText (m_properties -> originalSize().isEmpty() ? QString::fromLatin1("") : QString::number (m_properties -> originalSize().height())); + c_display_size -> setCurrentItem (m_properties -> displaySizeOption()); + displaySizeChanged (c_display_size -> currentItem()); + c_maintain_aspect -> setCurrentItem (m_properties -> maintainAspectOption() + 1); +@@ -266,7 +266,7 @@ + + void KPlayerPropertiesSubtitles::autoloadChanged (int option) + { +- c_url -> setText (option < 2 || m_properties -> subtitleUrl().isEmpty() ? "" ++ c_url -> setText (option < 2 || m_properties -> subtitleUrl().isEmpty() ? QString::fromLatin1("") + : m_properties -> subtitleUrl().isLocalFile() ? m_properties -> subtitleUrl().path() + : m_properties -> subtitleUrl().url()); + c_url -> setEnabled (option == 2); +@@ -274,7 +274,7 @@ + + void KPlayerPropertiesSubtitles::positionChanged (int option) + { +- c_position -> setText (option > 0 ? QString::number (m_properties -> subtitlePositionValue()) : ""); ++ c_position -> setText (option > 0 ? QString::number (m_properties -> subtitlePositionValue()) : QString::fromLatin1("")); + c_position -> setEnabled (option > 0); + if ( option > 0 && sender() ) + { +@@ -285,7 +285,7 @@ + + void KPlayerPropertiesSubtitles::delayChanged (int option) + { +- c_delay -> setText (option > 0 ? QString::number (m_properties -> subtitleDelayValue()) : ""); ++ c_delay -> setText (option > 0 ? QString::number (m_properties -> subtitleDelayValue()) : QString::fromLatin1("")); + c_delay -> setEnabled (option > 0); + if ( option > 0 && sender() ) + { +@@ -348,7 +348,7 @@ + + void KPlayerPropertiesAudio::volumeChanged (int option) + { +- c_volume -> setText (option > 0 ? QString::number (m_properties -> volumeValue()) : ""); ++ c_volume -> setText (option > 0 ? QString::number (m_properties -> volumeValue()) : QString::fromLatin1("")); + c_volume -> setEnabled (option > 0); + if ( option > 0 && sender() ) + { +@@ -359,7 +359,7 @@ + + void KPlayerPropertiesAudio::delayChanged (int option) + { +- c_delay -> setText (option > 0 ? QString::number (m_properties -> audioDelayValue()) : ""); ++ c_delay -> setText (option > 0 ? QString::number (m_properties -> audioDelayValue()) : QString::fromLatin1("")); + c_delay -> setEnabled (option > 0); + if ( option > 0 && sender() ) + { +@@ -441,7 +441,7 @@ + + void KPlayerPropertiesVideo::contrastChanged (int option) + { +- c_contrast -> setText (option > 0 ? QString::number (m_properties -> contrastValue()) : ""); ++ c_contrast -> setText (option > 0 ? QString::number (m_properties -> contrastValue()) : QString::fromLatin1("")); + c_contrast -> setEnabled (option > 0); + if ( option > 0 && sender() ) + { +@@ -452,7 +452,7 @@ + + void KPlayerPropertiesVideo::brightnessChanged (int option) + { +- c_brightness -> setText (option > 0 ? QString::number (m_properties -> brightnessValue()) : ""); ++ c_brightness -> setText (option > 0 ? QString::number (m_properties -> brightnessValue()) : QString::fromLatin1("")); + c_brightness -> setEnabled (option > 0); + if ( option > 0 && sender() ) + { +@@ -463,7 +463,7 @@ + + void KPlayerPropertiesVideo::hueChanged (int option) + { +- c_hue -> setText (option > 0 ? QString::number (m_properties -> hueValue()) : ""); ++ c_hue -> setText (option > 0 ? QString::number (m_properties -> hueValue()) : QString::fromLatin1("")); + c_hue -> setEnabled (option > 0); + if ( option > 0 && sender() ) + { +@@ -474,7 +474,7 @@ + + void KPlayerPropertiesVideo::saturationChanged (int option) + { +- c_saturation -> setText (option > 0 ? QString::number (m_properties -> saturationValue()) : ""); ++ c_saturation -> setText (option > 0 ? QString::number (m_properties -> saturationValue()) : QString::fromLatin1("")); + c_saturation -> setEnabled (option > 0); + if ( option > 0 && sender() ) + { +@@ -524,7 +524,7 @@ + + void KPlayerPropertiesAdvanced::commandLineChanged (int option) + { +- c_command_line -> setText (option > 0 ? m_properties -> commandLineValue() : ""); ++ c_command_line -> setText (option > 0 ? m_properties -> commandLineValue() : QString::fromLatin1("")); + c_command_line -> setEnabled (option > 0); + if ( option > 0 && sender() ) + { diff --git a/multimedia/kplayer/files/patch-kplayersettings.h b/multimedia/kplayer/files/patch-kplayersettings.h new file mode 100644 index 000000000000..da34272e09c3 --- /dev/null +++ b/multimedia/kplayer/files/patch-kplayersettings.h @@ -0,0 +1,11 @@ +--- kplayer/kplayersettings.h.orig Sat Oct 16 02:00:48 2004 ++++ kplayer/kplayersettings.h Sat Oct 16 02:01:22 2004 +@@ -982,7 +982,7 @@ + } + + QString executablePathDefault (void) const +- { return m_executable_path_default.isEmpty() ? "mplayer" : m_executable_path_default; } ++ { return m_executable_path_default.isEmpty() ? QString::fromLatin1("mplayer") : m_executable_path_default; } + void setExecutablePathDefault (QString path) + { m_executable_path_default = path; } + diff --git a/multimedia/kplayer/files/patch-kplayersettingsdialog.cpp b/multimedia/kplayer/files/patch-kplayersettingsdialog.cpp new file mode 100644 index 000000000000..5cc882a58ec6 --- /dev/null +++ b/multimedia/kplayer/files/patch-kplayersettingsdialog.cpp @@ -0,0 +1,29 @@ +--- kplayer/kplayersettingsdialog.cpp.orig Sat Oct 16 02:16:39 2004 ++++ kplayer/kplayersettingsdialog.cpp Sat Oct 16 02:17:35 2004 +@@ -271,7 +271,7 @@ + config -> deleteEntry ("Settings Dialog Page"); + else + config -> writeEntry ("Settings Dialog Page", name); +- setHelp (name.isEmpty() ? "settings" : "settings-" + name); ++ setHelp (name.isEmpty() ? QString::fromLatin1("settings") : "settings-" + name); + } + + void KPlayerSettingsDialog::slotOk (void) +@@ -435,7 +435,7 @@ + KPlayerSettings* settings = kPlayerSettings(); + c_driver_fallback -> setChecked (index > 0 && settings -> audioDriverFallbackDefault()); + c_driver_fallback -> setEnabled (index > 0); +- c_device -> setText (index > 0 ? settings -> audioDeviceDefault() : ""); ++ c_device -> setText (index > 0 ? settings -> audioDeviceDefault() : QString::fromLatin1("")); + c_device -> setEnabled (index > 0); + } + +@@ -792,7 +792,7 @@ + KPlayerSettings* settings = kPlayerSettings(); + c_driver_fallback -> setChecked (index > 0 && settings -> videoDriverFallbackDefault()); + c_driver_fallback -> setEnabled (index > 0); +- c_device -> setText (index > 0 ? settings -> videoDeviceDefault() : ""); ++ c_device -> setText (index > 0 ? settings -> videoDeviceDefault() : QString::fromLatin1("")); + c_device -> setEnabled (index > 0); + } + diff --git a/multimedia/kplayer/pkg-plist b/multimedia/kplayer/pkg-plist index c27dbc135c7e..cb029ab245a1 100644 --- a/multimedia/kplayer/pkg-plist +++ b/multimedia/kplayer/pkg-plist @@ -137,8 +137,6 @@ share/locale/it/LC_MESSAGES/kplayer.mo share/locale/pl/LC_MESSAGES/kplayer.mo share/locale/ru/LC_MESSAGES/kplayer.mo share/locale/zh_CN/LC_MESSAGES/kplayer.mo -share/nls/POSIX -share/nls/en_US.US-ASCII share/services/kfile_kplayer.desktop share/services/kplayerpart.desktop share/services/mms.protocol |