diff --git a/0012-set-dialog-font-display-error.patch b/0012-set-dialog-font-display-error.patch new file mode 100644 index 0000000000000000000000000000000000000000..ce19fcff1b7bf28d4a7dd86a5475dbd93e3576c3 --- /dev/null +++ b/0012-set-dialog-font-display-error.patch @@ -0,0 +1,385 @@ +diff --git a/nfs-mplayer-1.0.0/src/prefaudio.cpp b/nfs-mplayer-1.0.0/src/prefaudio.cpp +index ac3be05..4e66c39 100644 +--- a/nfs-mplayer-1.0.0/src/prefaudio.cpp ++++ b/nfs-mplayer-1.0.0/src/prefaudio.cpp +@@ -17,9 +17,14 @@ PrefAudio::PrefAudio(QWidget *parent, Qt::WindowFlags f) + i->getInfo(); + ao_list = i->aoList(); + ++ QFont font; ++ font.setFamily("Microsoft YaHei"); ++ font.setPixelSize(12); ++ + QLabel *driverLab = new QLabel(this); + driverLab->setText("输出驱动:"); + driverLab->setGeometry(36,2,50,24); ++ driverLab->setFont(font); + driverList = new QComboBox(this); + + driverList->addItem(tr("默认"), ""); +@@ -44,6 +49,7 @@ PrefAudio::PrefAudio(QWidget *parent, Qt::WindowFlags f) + QLabel *channelLab = new QLabel(this); + channelLab->setText("默认声道:"); + channelLab->setGeometry(36,32,50,24); ++ channelLab->setFont(font); + channelList = new QComboBox(this); + channelList->addItem( "2", MediaSettings::ChStereo ); + channelList->addItem( "4", MediaSettings::ChSurround ); +@@ -73,11 +79,13 @@ PrefAudio::PrefAudio(QWidget *parent, Qt::WindowFlags f) + QLabel *syncAVLab = new QLabel(this); + syncAVLab->setText("音频/视频同步"); + syncAVLab->setGeometry(55,58,120,24); ++ syncAVLab->setFont(font); + + factorLab = new QLabel(this); + factorLab->setText("因子:"); + factorLab->setGeometry(70,82,30,24); + factorLab->setDisabled(true); ++ factorLab->setFont(font); + factorSbox = new QSpinBox(this); + factorSbox->setDisabled(true); + factorSbox->setMaximum(100); +@@ -90,12 +98,14 @@ PrefAudio::PrefAudio(QWidget *parent, Qt::WindowFlags f) + QLabel *globalVolumeLab = new QLabel(this); + globalVolumeLab->setText("全局音量"); + globalVolumeLab->setGeometry(55,106,120,24); ++ globalVolumeLab->setFont(font); + + volumeStandardizationCbox = new QCheckBox(this); + volumeStandardizationCbox->setGeometry(36,132,16,16); + QLabel *volumeStandardizationLab = new QLabel(this); + volumeStandardizationLab->setText("默认音量标准化"); + volumeStandardizationLab->setGeometry(55,128,120,24); ++ volumeStandardizationLab->setFont(font); + } + + PrefAudio::~PrefAudio() +diff --git a/nfs-mplayer-1.0.0/src/prefgeneralnew.cpp b/nfs-mplayer-1.0.0/src/prefgeneralnew.cpp +index a0c1f54..b5f7228 100644 +--- a/nfs-mplayer-1.0.0/src/prefgeneralnew.cpp ++++ b/nfs-mplayer-1.0.0/src/prefgeneralnew.cpp +@@ -25,9 +25,14 @@ PrefGeneralNew::PrefGeneralNew(QWidget *parent, Qt::WindowFlags f) + this->setAttribute(Qt::WA_StyledBackground,true); + this->setStyleSheet("background-color: #fcfcfc"); + ++ QFont font; ++ font.setFamily("Microsoft YaHei"); ++ font.setPixelSize(12); ++ + engineLab = new QLabel(this); + engineLab->setText("多媒体引擎:"); + engineLab->setGeometry(36,2,65,24); ++ engineLab->setFont(font); + engineList = new QComboBox(this); + + #ifdef MPLAYER_MPV_SELECTION +@@ -56,12 +61,14 @@ PrefGeneralNew::PrefGeneralNew(QWidget *parent, Qt::WindowFlags f) + QLabel *miniPauseLab = new QLabel(this); + miniPauseLab->setText("最小化时暂停"); + miniPauseLab->setGeometry(55,31,120,24); ++ miniPauseLab->setFont(font); + + endCloseCbox = new QCheckBox(this); + endCloseCbox->setGeometry(36,60,16,16); + QLabel *endCloseLab = new QLabel(this); + endCloseLab->setText("播放结束时关闭"); + endCloseLab->setGeometry(55,56,120,24); ++ endCloseLab->setFont(font); + + enableScreenshotCbox = new QCheckBox(this); + connect(enableScreenshotCbox, SIGNAL(stateChanged(int)), this, SLOT(onStateChanged(int))); +@@ -69,18 +76,21 @@ PrefGeneralNew::PrefGeneralNew(QWidget *parent, Qt::WindowFlags f) + enableScreenshotLab = new QLabel(this); + enableScreenshotLab->setText("启用屏幕截图"); + enableScreenshotLab->setGeometry(55,81,120,24); ++ enableScreenshotLab->setFont(font); + // enableScreenshotLab->setEnabled(false); + // enableScreenshotCbox->setEnabled(false); + + savePathLab = new QLabel(this); + savePathLab->setText("保存路径:"); + savePathLab->setGeometry(36,110,55,24); ++ savePathLab->setFont(font); + screenshotEdit = new FileChooser(this); + screenshotEdit->setDialogType(FileChooser::GetDirectory); + screenshotEdit->setGeometry(105,110,280,21); + + fileNametemplateLab = new QLabel(this); + fileNametemplateLab->setText("文件名模板:"); ++ fileNametemplateLab->setFont(font); + fileNametemplateLab->setGeometry(36,140,65,24); + fileNametemplateLedit = new QLineEdit(this); + fileNametemplateLedit->setGeometry(105,140,120,20); +@@ -88,6 +98,7 @@ PrefGeneralNew::PrefGeneralNew(QWidget *parent, Qt::WindowFlags f) + fileformatLab = new QLabel(this); + fileformatLab->setText("格式:"); + fileformatLab->setGeometry(250,140,35,24); ++ fileformatLab->setFont(font); + formatList = new QComboBox(this); + formatList->setGeometry(285,140,100,20); + +@@ -113,6 +124,7 @@ PrefGeneralNew::PrefGeneralNew(QWidget *parent, Qt::WindowFlags f) + QLabel *exitSavePlaylistLab = new QLabel(this); + exitSavePlaylistLab->setText("退出时保存播放列表"); + exitSavePlaylistLab->setGeometry(55,169,120,24); ++ exitSavePlaylistLab->setFont(font); + + #ifdef MPV_SUPPORT + // formatList->addItems(QStringList() << "png" << "ppm" << "pgm" << "pgmyuv" << "tga" << "jpg" << "jpeg"); +diff --git a/nfs-mplayer-1.0.0/src/prefperformance_.cpp b/nfs-mplayer-1.0.0/src/prefperformance_.cpp +index 2d98333..ff6c6a8 100644 +--- a/nfs-mplayer-1.0.0/src/prefperformance_.cpp ++++ b/nfs-mplayer-1.0.0/src/prefperformance_.cpp +@@ -12,9 +12,14 @@ PrefPerformance_::PrefPerformance_(QWidget *parent, Qt::WindowFlags f) + this->setAttribute(Qt::WA_StyledBackground,true); + this->setStyleSheet("background-color: #fcfcfc"); + ++ QFont font; ++ font.setFamily("Microsoft YaHei"); ++ font.setPixelSize(12); ++ + QLabel *decodeThreadLab = new QLabel(this); + decodeThreadLab->setText("解码线程:"); + decodeThreadLab->setGeometry(36,2,50,24); ++ decodeThreadLab->setFont(font); + decodeThreadSbox = new QSpinBox(this); + decodeThreadSbox->setMaximum(16); + decodeThreadSbox->setMinimum(1); +@@ -32,6 +37,7 @@ PrefPerformance_::PrefPerformance_(QWidget *parent, Qt::WindowFlags f) + QLabel *useHardwareDecodeLab = new QLabel(this); + useHardwareDecodeLab->setText("硬件解码:"); + useHardwareDecodeLab->setGeometry(36,45,50,24); ++ useHardwareDecodeLab->setFont(font); + useHardwareDecodeList = new QComboBox(this); + useHardwareDecodeList->addItem(tr("None"), "no"); + useHardwareDecodeList->addItem(tr("Auto"), "auto"); +@@ -59,6 +65,7 @@ PrefPerformance_::PrefPerformance_(QWidget *parent, Qt::WindowFlags f) + QLabel *fileCacheLab = new QLabel(this); + fileCacheLab->setText("本地文件缓存:"); + fileCacheLab->setGeometry(36,75,75,24); ++ fileCacheLab->setFont(font); + fileCacheSbox = new QSpinBox(this); + fileCacheSbox->setMaximum(16); + fileCacheSbox->setMinimum(1); +@@ -71,6 +78,7 @@ PrefPerformance_::PrefPerformance_(QWidget *parent, Qt::WindowFlags f) + QLabel *streamCacheLab = new QLabel(this); + streamCacheLab->setText("流媒体缓存:"); + streamCacheLab->setGeometry(36,105,75,24); ++ streamCacheLab->setFont(font); + streamCacheSbox = new QSpinBox(this); + streamCacheSbox->setMaximum(16); + streamCacheSbox->setMinimum(1); +@@ -85,6 +93,7 @@ PrefPerformance_::PrefPerformance_(QWidget *parent, Qt::WindowFlags f) + QLabel *permitDropFrameLab = new QLabel(this); + permitDropFrameLab->setText("允许丢帧"); + permitDropFrameLab->setGeometry(55,131,120,24); ++ permitDropFrameLab->setFont(font); + } + + PrefPerformance_::~PrefPerformance_() +diff --git a/nfs-mplayer-1.0.0/src/prefsubtitles_.cpp b/nfs-mplayer-1.0.0/src/prefsubtitles_.cpp +index 16f91a6..f0e3168 100644 +--- a/nfs-mplayer-1.0.0/src/prefsubtitles_.cpp ++++ b/nfs-mplayer-1.0.0/src/prefsubtitles_.cpp +@@ -13,12 +13,17 @@ PrefSubtitles_::PrefSubtitles_(QWidget *parent, Qt::WindowFlags f) + this->setAttribute(Qt::WA_StyledBackground,true); + this->setStyleSheet("background-color: #fcfcfc"); + ++ QFont font; ++ font.setFamily("Microsoft YaHei"); ++ font.setPixelSize(12); ++ + autoLoadSubCbox = new QCheckBox(this); + autoLoadSubCbox->setGeometry(36,7,16,16); + + QLabel *autoLoadSubtitleFileLab = new QLabel(this); + autoLoadSubtitleFileLab->setText("自动加载字幕文件:"); + autoLoadSubtitleFileLab->setGeometry(56,2,100,24); ++ autoLoadSubtitleFileLab->setFont(font); + autoLoadSubtitleFileList = new QComboBox(this); + autoLoadSubtitleFileList->addItem("与影片的名称相同"); + autoLoadSubtitleFileList->addItem("所有包含影片名称的字幕"); +@@ -35,7 +40,7 @@ PrefSubtitles_::PrefSubtitles_(QWidget *parent, Qt::WindowFlags f) + + QLabel *defaultSubtitleEncodeLab = new QLabel(this); + defaultSubtitleEncodeLab->setText("默认字幕编码:"); +- ++ defaultSubtitleEncodeLab->setFont(font); + defaultSubtitleEncodeLab->setGeometry(36,35,100,24); + defaultSubtitleEncodeList = new QComboBox(this); + defaultSubtitleEncodeList->clear(); +@@ -63,6 +68,7 @@ PrefSubtitles_::PrefSubtitles_(QWidget *parent, Qt::WindowFlags f) + QLabel *languageAutoCheckLab = new QLabel(this); + languageAutoCheckLab->setText("尝试自动检测此语言:"); + languageAutoCheckLab->setGeometry(55,63,120,24); ++ languageAutoCheckLab->setFont(font); + + languageAutoCheckList = new QComboBox(this); + l = Languages::enca(); +@@ -89,29 +95,35 @@ PrefSubtitles_::PrefSubtitles_(QWidget *parent, Qt::WindowFlags f) + QLabel *screenshotWithSubtitleLab = new QLabel(this); + screenshotWithSubtitleLab->setText("屏幕截图时包含字幕"); + screenshotWithSubtitleLab->setGeometry(55,90,115,24); ++ screenshotWithSubtitleLab->setFont(font); + + freetype_check = new QCheckBox(this); + freetype_check->setText("使用Ass库"); + freetype_check->setGeometry(175,90,80,24); ++ freetype_check->setFont(font); + + use_ass_check= new QCheckBox(this); + use_ass_check->setText("支持FreeType"); + use_ass_check->setGeometry(260,90,95,24); ++ use_ass_check->setFont(font); + + ass_custom_check = new QCheckBox(this); + ass_custom_check->setText("使用自定义风格"); + connect(ass_custom_check, SIGNAL(stateChanged(int)), this, SLOT(onAssCustomCheckStateChanged(int))); + ass_custom_check->setGeometry(36,115,120,24); ++ ass_custom_check->setFont(font); + + force_ass_styles = new QCheckBox(this); + force_ass_styles->setText("将风格应用到ASS文件"); + force_ass_styles->setGeometry(175,115,140,24); + force_ass_styles->setDisabled(true); ++ force_ass_styles->setFont(font); + + fontLab = new QLabel(this); + fontLab->setText("字体:"); + fontLab->setGeometry(36,140,30,24); + fontLab->setDisabled(true); ++ fontLab->setFont(font); + fontList = new MyFontComboBox(this); + fontList->setGeometry(70,143,280,20); + fontList->setView(new QListView()); +@@ -129,6 +141,7 @@ PrefSubtitles_::PrefSubtitles_(QWidget *parent, Qt::WindowFlags f) + fontSizeLab->setText("大小:"); + fontSizeLab->setGeometry(36,170,30,24); + fontSizeLab->setDisabled(true); ++ fontSizeLab->setFont(font); + fontSizeList = new QSpinBox(this); + fontSizeList->setGeometry(70,173,80,20); + fontSizeList->setDisabled(true); +@@ -140,6 +153,7 @@ PrefSubtitles_::PrefSubtitles_(QWidget *parent, Qt::WindowFlags f) + boldLab->setText("粗体"); + boldLab->setGeometry(200,170,30,24); + boldLab->setDisabled(true); ++ boldLab->setFont(font); + + italicsCbox= new QCheckBox(this); + italicsCbox->setGeometry(245,175,16,16); +@@ -148,11 +162,13 @@ PrefSubtitles_::PrefSubtitles_(QWidget *parent, Qt::WindowFlags f) + italicsLab->setText("斜体"); + italicsLab->setGeometry(265,170,30,24); + italicsLab->setDisabled(true); ++ italicsLab->setFont(font); + + textColorLab = new QLabel(this); + textColorLab->setText("文本颜色:"); + textColorLab->setGeometry(36,200,50,24); + textColorLab->setDisabled(true); ++ textColorLab->setFont(font); + textColorScbtn = new SelectColorButton(this); + textColorScbtn->setGeometry(90,203,50,20); + textColorScbtn->setDisabled(true); +@@ -161,6 +177,7 @@ PrefSubtitles_::PrefSubtitles_(QWidget *parent, Qt::WindowFlags f) + StrokeColorLab->setText("描边颜色:"); + StrokeColorLab->setGeometry(160,200,50,24); + StrokeColorLab->setDisabled(true); ++ StrokeColorLab->setFont(font); + StrokeColorScbtn = new SelectColorButton(this); + StrokeColorScbtn->setGeometry(215,203,50,20); + StrokeColorScbtn->setDisabled(true); +@@ -169,6 +186,7 @@ PrefSubtitles_::PrefSubtitles_(QWidget *parent, Qt::WindowFlags f) + ShadowColorLab->setText("阴影颜色:"); + ShadowColorLab->setGeometry(285,200,50,24); + ShadowColorLab->setDisabled(true); ++ ShadowColorLab->setFont(font); + ShadowColorScbtn = new SelectColorButton(this); + ShadowColorScbtn->setGeometry(340,203,50,20); + ShadowColorScbtn->setDisabled(true); +@@ -178,6 +196,7 @@ PrefSubtitles_::PrefSubtitles_(QWidget *parent, Qt::WindowFlags f) + fontScaleLab->setGeometry(36,234,50,24); + fontScaleLab->setDisabled(true); + fontScaleLab->hide(); ++ fontScaleLab->setFont(font); + ass_font_scale_spin = new QDoubleSpinBox(this); + ass_font_scale_spin->setGeometry(90,234,50,24); + ass_font_scale_spin->setDisabled(true); +diff --git a/nfs-mplayer-1.0.0/src/prefvideo.cpp b/nfs-mplayer-1.0.0/src/prefvideo.cpp +index cf227ca..a7f1073 100644 +--- a/nfs-mplayer-1.0.0/src/prefvideo.cpp ++++ b/nfs-mplayer-1.0.0/src/prefvideo.cpp +@@ -23,9 +23,14 @@ PrefVideo::PrefVideo(QWidget *parent, Qt::WindowFlags f) + // Update the drivers list at the same time + vo_list = i->voList(); + ++ QFont font; ++ font.setFamily("Microsoft YaHei"); ++ font.setPixelSize(12); ++ + QLabel *driverLab = new QLabel(this); + driverLab->setText("输出驱动:"); + driverLab->setGeometry(36,2,50,24); ++ driverLab->setFont(font); + driverList = new QComboBox(this); + connect(driverList, SIGNAL(currentIndexChanged(int)), + this, SLOT(voComboChanged(int))); +@@ -54,36 +59,42 @@ PrefVideo::PrefVideo(QWidget *parent, Qt::WindowFlags f) + QLabel *enablePostProcessLab = new QLabel(this); + enablePostProcessLab->setText("默认启用后期处理"); + enablePostProcessLab->setGeometry(55,31,120,24); ++ enablePostProcessLab->setFont(font); + + useSoftwareVideoEqualizerCbox = new QCheckBox(this); + useSoftwareVideoEqualizerCbox->setGeometry(36,57,16,16); + QLabel *useSoftwareVideoEqualizerLab = new QLabel(this); + useSoftwareVideoEqualizerLab->setText("使用软件视频均衡器"); + useSoftwareVideoEqualizerLab->setGeometry(55,53,120,24); ++ useSoftwareVideoEqualizerLab->setFont(font); + + directRenderCbox = new QCheckBox(this); + directRenderCbox->setGeometry(36,79,16,16); + QLabel *directRenderLab = new QLabel(this); + directRenderLab->setText("直接渲染"); + directRenderLab->setGeometry(55,75,120,24); ++ directRenderLab->setFont(font); + + doubleBufferCbox = new QCheckBox(this); + doubleBufferCbox->setGeometry(36,101,16,16); + QLabel *doubleBufferLab = new QLabel(this); + doubleBufferLab->setText("双缓冲"); + doubleBufferLab->setGeometry(55,98,120,24); ++ doubleBufferLab->setFont(font); + + useSliceVideoCbox = new QCheckBox(this); + useSliceVideoCbox->setGeometry(36,123,16,16); + QLabel *useSliceVideoLab = new QLabel(this); + useSliceVideoLab->setText("使用切片方式绘制视频"); + useSliceVideoLab->setGeometry(55,119,120,24); ++ useSliceVideoLab->setFont(font); + + disableScreenSaverCbox = new QCheckBox(this); + disableScreenSaverCbox->setGeometry(36,145,16,16); + QLabel *disableScreenSaverLab = new QLabel(this); + disableScreenSaverLab->setText("禁用屏幕保护程序"); + disableScreenSaverLab->setGeometry(55,141,120,24); ++ disableScreenSaverLab->setFont(font); + + updateDriverCombos(); + } +diff --git a/nfs-mplayer-1.0.0/src/setingdialog.cpp b/nfs-mplayer-1.0.0/src/setingdialog.cpp +index 8a3eb19..2db572b 100644 +--- a/nfs-mplayer-1.0.0/src/setingdialog.cpp ++++ b/nfs-mplayer-1.0.0/src/setingdialog.cpp +@@ -178,6 +178,10 @@ void SetingDialog::playerChangedSlot(QString player) + void SetingDialog::addSection(PrefWidget *w) + { + QListWidgetItem *i = new QListWidgetItem(w->sectionName() ); ++ QFont font; ++ font.setFamily("Microsoft YaHei"); ++ font.setPixelSize(14); ++ i->setFont(font); + sections->addItem(i); + pages->addWidget(w); + } diff --git a/nfs-mplayer.spec b/nfs-mplayer.spec index 13c656e472aa420c2b8d6415cf03a3e72609c2c5..78158a8f90147bdb5d9091c73e86d733cc818bf4 100644 --- a/nfs-mplayer.spec +++ b/nfs-mplayer.spec @@ -1,6 +1,6 @@ Name: nfs-mplayer Version: 1.0.0 -Release: 12%{?dist} +Release: 13%{?dist} Summary: A great media player Group: Applications/Multimedia License: GPLv2+ @@ -16,6 +16,7 @@ Patch7: 0008-fix-draging-flickering-when-resizing.patch Patch8: 0009-fix-window-resizing-error-cannot-capture-mouse-release.patch Patch9: 0010-adjust-mpv-options-compatible-with-high-and-low-mpv-version.patch Patch10: 0011-update-README.patch +Patch11: 0012-set-dialog-font-display-error.patch %if 0%{?suse_version} BuildRequires: hicolor-icon-theme @@ -116,6 +117,9 @@ update-desktop-database &> /dev/null || : %changelog +* Wed Oct 18 2023 ruizhe - 1.0.0-13 +- fix setting-dialog font style error + * Wed Oct 18 2023 ruizhe - 1.0.0-12 - Update README.md