diff --git a/QtScrcpy/QtScrcpy.pro b/QtScrcpy/QtScrcpy.pro index 6fdc421..fd42dfc 100644 --- a/QtScrcpy/QtScrcpy.pro +++ b/QtScrcpy/QtScrcpy.pro @@ -161,5 +161,5 @@ linux { # message("test") RESOURCES += \ - res.qrc + res/res.qrc diff --git a/QtScrcpy/fontawesome/iconhelper.cpp b/QtScrcpy/fontawesome/iconhelper.cpp index e8e8024..6698f32 100644 --- a/QtScrcpy/fontawesome/iconhelper.cpp +++ b/QtScrcpy/fontawesome/iconhelper.cpp @@ -4,7 +4,7 @@ IconHelper* IconHelper::_instance = 0; IconHelper::IconHelper(QObject*): QObject(qApp) { - int fontId = QFontDatabase::addApplicationFont(":/res/fontawesome-webfont.ttf"); + int fontId = QFontDatabase::addApplicationFont(":/font/fontawesome-webfont.ttf"); QString fontName = QFontDatabase::applicationFontFamilies(fontId).at(0); iconFont = QFont(fontName); } diff --git a/QtScrcpy/i18n/QtScrcpy_en.qm b/QtScrcpy/i18n/QtScrcpy_en.qm deleted file mode 100644 index e68d0b4..0000000 Binary files a/QtScrcpy/i18n/QtScrcpy_en.qm and /dev/null differ diff --git a/QtScrcpy/i18n/QtScrcpy_zh.qm b/QtScrcpy/i18n/QtScrcpy_zh.qm deleted file mode 100644 index 2b8bda8..0000000 Binary files a/QtScrcpy/i18n/QtScrcpy_zh.qm and /dev/null differ diff --git a/QtScrcpy/main.cpp b/QtScrcpy/main.cpp index c1ede4b..8181b85 100644 --- a/QtScrcpy/main.cpp +++ b/QtScrcpy/main.cpp @@ -39,7 +39,7 @@ int main(int argc, char *argv[]) #endif //加载样式表 - QFile file(":/res/psblack.css"); + QFile file(":/qss/psblack.css"); if (file.open(QFile::ReadOnly)) { QString qss = QLatin1String(file.readAll()); QString paletteColor = qss.mid(20, 7); @@ -62,7 +62,7 @@ void installTranslator() { static QTranslator translator; QLocale locale; QLocale::Language language = locale.language(); - QString languagePath = ":i18n/"; + QString languagePath = ":/i18n/"; switch (language) { case QLocale::Chinese: languagePath += "QtScrcpy_zh.qm"; diff --git a/QtScrcpy/res.qrc b/QtScrcpy/res.qrc deleted file mode 100644 index 62878b4..0000000 --- a/QtScrcpy/res.qrc +++ /dev/null @@ -1,12 +0,0 @@ - - - res/psblack.css - res/fontawesome-webfont.ttf - res/phone-h.png - res/phone-v.png - qml/pinwheel.qml - qml/images/pinwheel.png - i18n/QtScrcpy_en.qm - i18n/QtScrcpy_zh.qm - - diff --git a/QtScrcpy/res/fontawesome-webfont.ttf b/QtScrcpy/res/font/fontawesome-webfont.ttf similarity index 100% rename from QtScrcpy/res/fontawesome-webfont.ttf rename to QtScrcpy/res/font/fontawesome-webfont.ttf diff --git a/QtScrcpy/res/fontawesome-webfont.pdf b/QtScrcpy/res/fontawesome-webfont.pdf deleted file mode 100644 index 628a4a6..0000000 Binary files a/QtScrcpy/res/fontawesome-webfont.pdf and /dev/null differ diff --git a/QtScrcpy/res/i18n/QtScrcpy_en.qm b/QtScrcpy/res/i18n/QtScrcpy_en.qm new file mode 100644 index 0000000..db18648 Binary files /dev/null and b/QtScrcpy/res/i18n/QtScrcpy_en.qm differ diff --git a/QtScrcpy/i18n/QtScrcpy_en.ts b/QtScrcpy/res/i18n/QtScrcpy_en.ts similarity index 59% rename from QtScrcpy/i18n/QtScrcpy_en.ts rename to QtScrcpy/res/i18n/QtScrcpy_en.ts index 6e80b91..a8fdbfd 100644 --- a/QtScrcpy/i18n/QtScrcpy_en.ts +++ b/QtScrcpy/res/i18n/QtScrcpy_en.ts @@ -4,78 +4,93 @@ Dialog - + Wireless Wireless - + wireless connect wireless connect - + wireless disconnect wireless disconnect - + record save path: record save psth: - - + + select path select path - + + record format： + record format: + + + + always top + always top + + + + close screen + close screen + + + USB line USB line - + stop server stop server - + start server start server - + device serial: device serial: - + Config Config - + bit rate: bit rate: - + video size: video size: - + start adbd start adbd - + get device ip get device ip - + update device update device @@ -83,52 +98,57 @@ ToolForm - + Tool Tool - + full screen full screen - + + expand notify + expand notify + + + turn off turn off - + turn on turn on - + volume up volume up - + volume down volume down - + app switch app switch - + menu menu - + home home - + return return @@ -136,22 +156,22 @@ VideoForm - + wait current file transfer to complete wait current file transfer to complete - + file transfer complete file transfer complete - + file transfer failed file transfer failed - + file does not exist file does not exist @@ -159,9 +179,8 @@ videoForm - qrc:/qml/pinwheel.qml - qrc:/qml/pinwheel.qml + qrc:/qml/pinwheel.qml diff --git a/QtScrcpy/res/i18n/QtScrcpy_zh.qm b/QtScrcpy/res/i18n/QtScrcpy_zh.qm new file mode 100644 index 0000000..26955db Binary files /dev/null and b/QtScrcpy/res/i18n/QtScrcpy_zh.qm differ diff --git a/QtScrcpy/i18n/QtScrcpy_zh.ts b/QtScrcpy/res/i18n/QtScrcpy_zh.ts similarity index 59% rename from QtScrcpy/i18n/QtScrcpy_zh.ts rename to QtScrcpy/res/i18n/QtScrcpy_zh.ts index 7182fe1..f644ad4 100644 --- a/QtScrcpy/i18n/QtScrcpy_zh.ts +++ b/QtScrcpy/res/i18n/QtScrcpy_zh.ts @@ -4,78 +4,93 @@ Dialog - + Wireless 无线 - + wireless connect 无线连接 - + wireless disconnect 无线断开 - + record save path: 录像保存路径： - - + + select path 选择路径 - + + record format： + 录制格式： + + + + always top + 置顶 + + + + close screen + 关闭屏幕 + + + USB line USB线 - + stop server 停止服务 - + start server 启动服务 - + device serial: 设备序列号： - + Config 配置 - + bit rate: 比特率： - + video size: 视频尺寸： - + start adbd 启动adbd - + get device ip 获取设备IP - + update device 刷新设备列表 @@ -83,52 +98,57 @@ ToolForm - + Tool 工具 - + full screen 全屏 - + + expand notify + 下拉通知 + + + turn off 锁屏 - + turn on 解锁 - + volume up 音量加 - + volume down 音量减 - + app switch 切换应用 - + menu 菜单 - + home 主界面 - + return 返回 @@ -136,22 +156,22 @@ VideoForm - + wait current file transfer to complete 等待当前文件传输完成 - + file transfer complete 文件传输完成 - + file transfer failed 文件传输失败 - + file does not exist 文件不存在 @@ -159,9 +179,8 @@ videoForm - qrc:/qml/pinwheel.qml - qrc:/qml/pinwheel.qml + qrc:/qml/pinwheel.qml diff --git a/QtScrcpy/res/phone-h.png b/QtScrcpy/res/image/videoform/phone-h.png similarity index 100% rename from QtScrcpy/res/phone-h.png rename to QtScrcpy/res/image/videoform/phone-h.png diff --git a/QtScrcpy/res/phone-v.png b/QtScrcpy/res/image/videoform/phone-v.png similarity index 100% rename from QtScrcpy/res/phone-v.png rename to QtScrcpy/res/image/videoform/phone-v.png diff --git a/QtScrcpy/qml/images/pinwheel.png b/QtScrcpy/res/qml/images/pinwheel.png similarity index 100% rename from QtScrcpy/qml/images/pinwheel.png rename to QtScrcpy/res/qml/images/pinwheel.png diff --git a/QtScrcpy/qml/pinwheel.qml b/QtScrcpy/res/qml/pinwheel.qml similarity index 100% rename from QtScrcpy/qml/pinwheel.qml rename to QtScrcpy/res/qml/pinwheel.qml diff --git a/QtScrcpy/res/psblack.css b/QtScrcpy/res/qss/psblack.css similarity index 95% rename from QtScrcpy/res/psblack.css rename to QtScrcpy/res/qss/psblack.css index 7247d28..18f0019 100644 --- a/QtScrcpy/res/psblack.css +++ b/QtScrcpy/res/qss/psblack.css @@ -1,642 +1,642 @@ -QPalette{background:#444444;}*{outline:0px;color:#DCDCDC;} - -QWidget[form="true"],QLabel[frameShape="1"]{ -border:1px solid #242424; -border-radius:0px; -} - -QWidget[form="bottom"]{ -background:#484848; -} - -QWidget[form="bottom"] .QFrame{ -border:1px solid #DCDCDC; -} - -QWidget[form="bottom"] QLabel,QWidget[form="title"] QLabel{ -border-radius:0px; -color:#DCDCDC; -background:none; -border-style:none; -} - -QWidget[form="title"],QWidget[nav="left"],QWidget[nav="top"] QAbstractButton{ -border-style:none; -border-radius:0px; -padding:5px; -color:#DCDCDC; -background:qlineargradient(spread:pad,x1:0,y1:0,x2:0,y2:1,stop:0 #484848,stop:1 #383838); -} - -QWidget[nav="top"] QAbstractButton:hover,QWidget[nav="top"] QAbstractButton:pressed,QWidget[nav="top"] QAbstractButton:checked{ -border-style:solid; -border-width:0px 0px 2px 0px; -padding:4px 4px 2px 4px; -border-color:#00BB9E; -background:qlineargradient(spread:pad,x1:0,y1:0,x2:0,y2:1,stop:0 #646464,stop:1 #525252); -} - -QWidget[nav="left"] QAbstractButton{ -border-radius:0px; -color:#DCDCDC; -background:none; -border-style:none; -} - -QWidget[nav="left"] QAbstractButton:hover{ -color:#FFFFFF; -background-color:#00BB9E; -} - -QWidget[nav="left"] QAbstractButton:checked,QWidget[nav="left"] QAbstractButton:pressed{ -color:#DCDCDC; -border-style:solid; -border-width:0px 0px 0px 2px; -padding:4px 4px 4px 2px; -border-color:#00BB9E; -background-color:#444444; -} - -QWidget[video="true"] QLabel{ -color:#DCDCDC; -border:1px solid #242424; -background:qlineargradient(spread:pad,x1:0,y1:0,x2:0,y2:1,stop:0 #484848,stop:1 #383838); -} - -QWidget[video="true"] QLabel:focus{ -border:1px solid #00BB9E; -background:qlineargradient(spread:pad,x1:0,y1:0,x2:0,y2:1,stop:0 #646464,stop:1 #525252); -} - -QLineEdit,QTextEdit,QPlainTextEdit,QSpinBox,QDoubleSpinBox,QComboBox,QDateEdit,QTimeEdit,QDateTimeEdit{ -border:1px solid #242424; -border-radius:3px; -padding:2px; -background:none; -selection-background-color:#484848; -selection-color:#DCDCDC; -} - -QLineEdit:focus,QTextEdit:focus,QPlainTextEdit:focus,QSpinBox:focus,QDoubleSpinBox:focus,QComboBox:focus,QDateEdit:focus,QTimeEdit:focus,QDateTimeEdit:focus,QLineEdit:hover,QTextEdit:hover,QPlainTextEdit:hover,QSpinBox:hover,QDoubleSpinBox:hover,QComboBox:hover,QDateEdit:hover,QTimeEdit:hover,QDateTimeEdit:hover{ -border:1px solid #242424; -} - -QLineEdit[echoMode="2"]{ -lineedit-password-character:9679; -} - -.QFrame{ -border:1px solid #242424; -border-radius:3px; -} - -.QGroupBox{ -border:1px solid #242424; -border-radius:5px; -margin-top:3ex; -} - -.QGroupBox::title{ -subcontrol-origin:margin; -position:relative; -left:10px; -} - -.QPushButton,.QToolButton{ -border-style:none; -border:1px solid #242424; -color:#DCDCDC; -padding:5px; -min-height:15px; -border-radius:5px; -background:qlineargradient(spread:pad,x1:0,y1:0,x2:0,y2:1,stop:0 #484848,stop:1 #383838); -} - -.QPushButton:hover,.QToolButton:hover{ -background:qlineargradient(spread:pad,x1:0,y1:0,x2:0,y2:1,stop:0 #646464,stop:1 #525252); -} - -.QPushButton:pressed,.QToolButton:pressed{ -background:qlineargradient(spread:pad,x1:0,y1:0,x2:0,y2:1,stop:0 #484848,stop:1 #383838); -} - -.QToolButton::menu-indicator{ -image:None; -} - -QToolButton#btnMenu,QPushButton#btnMenu_Min,QPushButton#btnMenu_Max,QPushButton#btnMenu_Close{ -border-radius:3px; -color:#DCDCDC; -padding:3px; -margin:0px; -background:none; -border-style:none; -} - -QToolButton#btnMenu:hover,QPushButton#btnMenu_Min:hover,QPushButton#btnMenu_Max:hover{ -color:#FFFFFF; -margin:1px 1px 2px 1px; -background-color:rgba(51,127,209,230); -} - -QPushButton#btnMenu_Close:hover{ -color:#FFFFFF; -margin:1px 1px 2px 1px; -background-color:rgba(238,0,0,128); -} - -QRadioButton::indicator{ -width:15px; -height:15px; -} - -QRadioButton::indicator::unchecked{ -image:url(:/qss/psblack/radiobutton_unchecked.png); -} - -QRadioButton::indicator::unchecked:disabled{ -image:url(:/qss/psblack/radiobutton_unchecked_disable.png); -} - -QRadioButton::indicator::checked{ -image:url(:/qss/psblack/radiobutton_checked.png); -} - -QRadioButton::indicator::checked:disabled{ -image:url(:/qss/psblack/radiobutton_checked_disable.png); -} - -QGroupBox::indicator,QTreeWidget::indicator,QListWidget::indicator{ -padding:0px -3px 0px 3px; -} - -QCheckBox::indicator,QGroupBox::indicator,QTreeWidget::indicator,QListWidget::indicator{ -width:13px; -height:13px; -} - -QCheckBox::indicator:unchecked,QGroupBox::indicator:unchecked,QTreeWidget::indicator:unchecked,QListWidget::indicator:unchecked{ -image:url(:/qss/psblack/checkbox_unchecked.png); -} - -QCheckBox::indicator:unchecked:disabled,QGroupBox::indicator:unchecked:disabled,QTreeWidget::indicator:unchecked:disabled,QListWidget::indicator:disabled{ -image:url(:/qss/psblack/checkbox_unchecked_disable.png); -} - -QCheckBox::indicator:checked,QGroupBox::indicator:checked,QTreeWidget::indicator:checked,QListWidget::indicator:checked{ -image:url(:/qss/psblack/checkbox_checked.png); -} - -QCheckBox::indicator:checked:disabled,QGroupBox::indicator:checked:disabled,QTreeWidget::indicator:checked:disabled,QListWidget::indicator:checked:disabled{ -image:url(:/qss/psblack/checkbox_checked_disable.png); -} - -QCheckBox::indicator:indeterminate,QGroupBox::indicator:indeterminate,QTreeWidget::indicator:indeterminate,QListWidget::indicator:indeterminate{ -image:url(:/qss/psblack/checkbox_parcial.png); -} - -QCheckBox::indicator:indeterminate:disabled,QGroupBox::indicator:indeterminate:disabled,QTreeWidget::indicator:indeterminate:disabled,QListWidget::indicator:indeterminate:disabled{ -image:url(:/qss/psblack/checkbox_parcial_disable.png); -} - -QTimeEdit::up-button,QDateEdit::up-button,QDateTimeEdit::up-button,QDoubleSpinBox::up-button,QSpinBox::up-button{ -image:url(:/qss/psblack/add_top.png); -width:10px; -height:10px; -padding:2px 5px 0px 0px; -} - -QTimeEdit::down-button,QDateEdit::down-button,QDateTimeEdit::down-button,QDoubleSpinBox::down-button,QSpinBox::down-button{ -image:url(:/qss/psblack/add_bottom.png); -width:10px; -height:10px; -padding:0px 5px 2px 0px; -} - -QTimeEdit::up-button:pressed,QDateEdit::up-button:pressed,QDateTimeEdit::up-button:pressed,QDoubleSpinBox::up-button:pressed,QSpinBox::up-button:pressed{ -top:-2px; -} - -QTimeEdit::down-button:pressed,QDateEdit::down-button:pressed,QDateTimeEdit::down-button:pressed,QDoubleSpinBox::down-button:pressed,QSpinBox::down-button:pressed,QSpinBox::down-button:pressed{ -bottom:-2px; -} - -QComboBox::down-arrow,QDateEdit[calendarPopup="true"]::down-arrow,QTimeEdit[calendarPopup="true"]::down-arrow,QDateTimeEdit[calendarPopup="true"]::down-arrow{ -image:url(:/qss/psblack/add_bottom.png); -width:10px; -height:10px; -right:2px; -} - -QComboBox::drop-down,QDateEdit::drop-down,QTimeEdit::drop-down,QDateTimeEdit::drop-down{ -subcontrol-origin:padding; -subcontrol-position:top right; -width:15px; -border-left-width:0px; -border-left-style:solid; -border-top-right-radius:3px; -border-bottom-right-radius:3px; -border-left-color:#242424; -} - -QComboBox::drop-down:on{ -top:1px; -} - -QMenuBar::item{ -color:#DCDCDC; -background-color:#484848; -margin:0px; -padding:3px 10px; -} - -QMenu,QMenuBar,QMenu:disabled,QMenuBar:disabled{ -color:#DCDCDC; -background-color:#484848; -border:1px solid #242424; -margin:0px; -} - -QMenu::item{ -padding:3px 20px; -} - -QMenu::indicator{ -width:13px; -height:13px; -} - -QMenu::item:selected,QMenuBar::item:selected{ -color:#DCDCDC; -border:0px solid #242424; -background:#646464; -} - -QMenu::separator{ -height:1px; -background:#242424; -} - -QProgressBar{ -min-height:10px; -background:#484848; -border-radius:5px; -text-align:center; -border:1px solid #484848; -} - -QProgressBar:chunk{ -border-radius:5px; -background-color:#242424; -} - -QSlider::groove:horizontal{ -background:#484848; -height:8px; -border-radius:4px; -} - -QSlider::add-page:horizontal{ -background:#484848; -height:8px; -border-radius:4px; -} - -QSlider::sub-page:horizontal{ -background:#242424; -height:8px; -border-radius:4px; -} - -QSlider::handle:horizontal{ -width:13px; -margin-top:-3px; -margin-bottom:-3px; -border-radius:6px; -background:qradialgradient(spread:pad,cx:0.5,cy:0.5,radius:0.5,fx:0.5,fy:0.5,stop:0.6 #444444,stop:0.8 #242424); -} - -QSlider::groove:vertical{ -width:8px; -border-radius:4px; -background:#484848; -} - -QSlider::add-page:vertical{ -width:8px; -border-radius:4px; -background:#484848; -} - -QSlider::sub-page:vertical{ -width:8px; -border-radius:4px; -background:#242424; -} - -QSlider::handle:vertical{ -height:14px; -margin-left:-3px; -margin-right:-3px; -border-radius:6px; -background:qradialgradient(spread:pad,cx:0.5,cy:0.5,radius:0.5,fx:0.5,fy:0.5,stop:0.6 #444444,stop:0.8 #242424); -} - -QScrollBar:horizontal{ -background:#484848; -padding:0px; -border-radius:6px; -max-height:12px; -} - -QScrollBar::handle:horizontal{ -background:#525252; -min-width:50px; -border-radius:6px; -} - -QScrollBar::handle:horizontal:hover{ -background:#242424; -} - -QScrollBar::handle:horizontal:pressed{ -background:#242424; -} - -QScrollBar::add-page:horizontal{ -background:none; -} - -QScrollBar::sub-page:horizontal{ -background:none; -} - -QScrollBar::add-line:horizontal{ -background:none; -} - -QScrollBar::sub-line:horizontal{ -background:none; -} - -QScrollBar:vertical{ -background:#484848; -padding:0px; -border-radius:6px; -max-width:12px; -} - -QScrollBar::handle:vertical{ -background:#525252; -min-height:50px; -border-radius:6px; -} - -QScrollBar::handle:vertical:hover{ -background:#242424; -} - -QScrollBar::handle:vertical:pressed{ -background:#242424; -} - -QScrollBar::add-page:vertical{ -background:none; -} - -QScrollBar::sub-page:vertical{ -background:none; -} - -QScrollBar::add-line:vertical{ -background:none; -} - -QScrollBar::sub-line:vertical{ -background:none; -} - -QScrollArea{ -border:0px; -} - -QTreeView,QListView,QTableView,QTabWidget::pane{ -border:1px solid #242424; -selection-background-color:#646464; -selection-color:#DCDCDC; -alternate-background-color:#525252; -gridline-color:#242424; -} - -QTreeView::branch:closed:has-children{ -margin:4px; -border-image:url(:/qss/psblack/branch_open.png); -} - -QTreeView::branch:open:has-children{ -margin:4px; -border-image:url(:/qss/psblack/branch_close.png); -} - -QTreeView,QListView,QTableView,QSplitter::handle,QTreeView::branch{ -background:#444444; -} - -QTableView::item:selected,QListView::item:selected,QTreeView::item:selected{ -color:#DCDCDC; -background:qlineargradient(spread:pad,x1:0,y1:0,x2:0,y2:1,stop:0 #484848,stop:1 #383838); -} - -QTableView::item:hover,QListView::item:hover,QTreeView::item:hover{ -color:#DCDCDC; -background:qlineargradient(spread:pad,x1:0,y1:0,x2:0,y2:1,stop:0 #646464,stop:1 #525252); -} - -QTableView::item,QListView::item,QTreeView::item{ -padding:1px; -margin:0px; -} - -QHeaderView::section,QTableCornerButton:section{ -padding:3px; -margin:0px; -color:#DCDCDC; -border:1px solid #242424; -border-left-width:0px; -border-right-width:1px; -border-top-width:0px; -border-bottom-width:1px; -background:qlineargradient(spread:pad,x1:0,y1:0,x2:0,y2:1,stop:0 #646464,stop:1 #525252); -} - -QTabBar::tab{ -border:1px solid #242424; -color:#DCDCDC; -margin:0px; -background:qlineargradient(spread:pad,x1:0,y1:0,x2:0,y2:1,stop:0 #646464,stop:1 #525252); -} - -QTabBar::tab:selected,QTabBar::tab:hover{ -border-style:solid; -border-color:#00BB9E; -background:qlineargradient(spread:pad,x1:0,y1:0,x2:0,y2:1,stop:0 #484848,stop:1 #383838); -} - -QTabBar::tab:top,QTabBar::tab:bottom{ -padding:3px 8px 3px 8px; -} - -QTabBar::tab:left,QTabBar::tab:right{ -padding:8px 3px 8px 3px; -} - -QTabBar::tab:top:selected,QTabBar::tab:top:hover{ -border-width:2px 0px 0px 0px; -} - -QTabBar::tab:right:selected,QTabBar::tab:right:hover{ -border-width:0px 0px 0px 2px; -} - -QTabBar::tab:bottom:selected,QTabBar::tab:bottom:hover{ -border-width:0px 0px 2px 0px; -} - -QTabBar::tab:left:selected,QTabBar::tab:left:hover{ -border-width:0px 2px 0px 0px; -} - -QTabBar::tab:first:top:selected,QTabBar::tab:first:top:hover,QTabBar::tab:first:bottom:selected,QTabBar::tab:first:bottom:hover{ -border-left-width:1px; -border-left-color:#242424; -} - -QTabBar::tab:first:left:selected,QTabBar::tab:first:left:hover,QTabBar::tab:first:right:selected,QTabBar::tab:first:right:hover{ -border-top-width:1px; -border-top-color:#242424; -} - -QTabBar::tab:last:top:selected,QTabBar::tab:last:top:hover,QTabBar::tab:last:bottom:selected,QTabBar::tab:last:bottom:hover{ -border-right-width:1px; -border-right-color:#242424; -} - -QTabBar::tab:last:left:selected,QTabBar::tab:last:left:hover,QTabBar::tab:last:right:selected,QTabBar::tab:last:right:hover{ -border-bottom-width:1px; -border-bottom-color:#242424; -} - -QStatusBar::item{ -border:0px solid #484848; -border-radius:3px; -} - -QToolBox::tab,QGroupBox#gboxDevicePanel,QGroupBox#gboxDeviceTitle,QFrame#gboxDevicePanel,QFrame#gboxDeviceTitle{ -padding:3px; -border-radius:5px; -color:#DCDCDC; -background:qlineargradient(spread:pad,x1:0,y1:0,x2:0,y2:1,stop:0 #484848,stop:1 #383838); -} - -QToolTip{ -border:0px solid #DCDCDC; -padding:1px; -color:#DCDCDC; -background:qlineargradient(spread:pad,x1:0,y1:0,x2:0,y2:1,stop:0 #484848,stop:1 #383838); -} - -QToolBox::tab:selected{ -background:qlineargradient(spread:pad,x1:0,y1:0,x2:0,y2:1,stop:0 #646464,stop:1 #525252); -} - -QPrintPreviewDialog QToolButton{ -border:0px solid #DCDCDC; -border-radius:0px; -margin:0px; -padding:3px; -background:none; -} - -QColorDialog QPushButton,QFileDialog QPushButton{ -min-width:80px; -} - -QToolButton#qt_calendar_prevmonth{ -icon-size:0px; -min-width:20px; -image:url(:/qss/psblack/calendar_prevmonth.png); -} - -QToolButton#qt_calendar_nextmonth{ -icon-size:0px; -min-width:20px; -image:url(:/qss/psblack/calendar_nextmonth.png); -} - -QToolButton#qt_calendar_prevmonth,QToolButton#qt_calendar_nextmonth,QToolButton#qt_calendar_monthbutton,QToolButton#qt_calendar_yearbutton{ -border:0px solid #DCDCDC; -border-radius:3px; -margin:3px 3px 3px 3px; -padding:3px; -background:none; -} - -QToolButton#qt_calendar_prevmonth:hover,QToolButton#qt_calendar_nextmonth:hover,QToolButton#qt_calendar_monthbutton:hover,QToolButton#qt_calendar_yearbutton:hover,QToolButton#qt_calendar_prevmonth:pressed,QToolButton#qt_calendar_nextmonth:pressed,QToolButton#qt_calendar_monthbutton:pressed,QToolButton#qt_calendar_yearbutton:pressed{ -border:1px solid #242424; -} - -QCalendarWidget QSpinBox#qt_calendar_yearedit{ -margin:2px; -} - -QCalendarWidget QToolButton::menu-indicator{ -image:None; -} - -QCalendarWidget QTableView{ -border-width:0px; -} - -QCalendarWidget QWidget#qt_calendar_navigationbar{ -border:1px solid #242424; -border-width:1px 1px 0px 1px; -background:qlineargradient(spread:pad,x1:0,y1:0,x2:0,y2:1,stop:0 #484848,stop:1 #383838); -} - -QComboBox QAbstractItemView::item{ -min-height:20px; -min-width:10px; -} - -QTableView[model="true"]::item{ -padding:0px; -margin:0px; -} - -QTableView QLineEdit,QTableView QComboBox,QTableView QSpinBox,QTableView QDoubleSpinBox,QTableView QDateEdit,QTableView QTimeEdit,QTableView QDateTimeEdit{ -border-width:0px; -border-radius:0px; -} - -QTableView QLineEdit:focus,QTableView QComboBox:focus,QTableView QSpinBox:focus,QTableView QDoubleSpinBox:focus,QTableView QDateEdit:focus,QTableView QTimeEdit:focus,QTableView QDateTimeEdit:focus{ -border-width:0px; -border-radius:0px; -} - -QLineEdit,QTextEdit,QPlainTextEdit,QSpinBox,QDoubleSpinBox,QComboBox,QDateEdit,QTimeEdit,QDateTimeEdit{ -background:#444444; -} - -*:disabled{ -background:#444444; -border-color:#484848; -} - -/*TextColor:#DCDCDC*/ -/*PanelColor:#444444*/ -/*BorderColor:#242424*/ -/*NormalColorStart:#484848*/ -/*NormalColorEnd:#383838*/ -/*DarkColorStart:#646464*/ -/*DarkColorEnd:#525252*/ +QPalette{background:#444444;}*{outline:0px;color:#DCDCDC;} + +QWidget[form="true"],QLabel[frameShape="1"]{ +border:1px solid #242424; +border-radius:0px; +} + +QWidget[form="bottom"]{ +background:#484848; +} + +QWidget[form="bottom"] .QFrame{ +border:1px solid #DCDCDC; +} + +QWidget[form="bottom"] QLabel,QWidget[form="title"] QLabel{ +border-radius:0px; +color:#DCDCDC; +background:none; +border-style:none; +} + +QWidget[form="title"],QWidget[nav="left"],QWidget[nav="top"] QAbstractButton{ +border-style:none; +border-radius:0px; +padding:5px; +color:#DCDCDC; +background:qlineargradient(spread:pad,x1:0,y1:0,x2:0,y2:1,stop:0 #484848,stop:1 #383838); +} + +QWidget[nav="top"] QAbstractButton:hover,QWidget[nav="top"] QAbstractButton:pressed,QWidget[nav="top"] QAbstractButton:checked{ +border-style:solid; +border-width:0px 0px 2px 0px; +padding:4px 4px 2px 4px; +border-color:#00BB9E; +background:qlineargradient(spread:pad,x1:0,y1:0,x2:0,y2:1,stop:0 #646464,stop:1 #525252); +} + +QWidget[nav="left"] QAbstractButton{ +border-radius:0px; +color:#DCDCDC; +background:none; +border-style:none; +} + +QWidget[nav="left"] QAbstractButton:hover{ +color:#FFFFFF; +background-color:#00BB9E; +} + +QWidget[nav="left"] QAbstractButton:checked,QWidget[nav="left"] QAbstractButton:pressed{ +color:#DCDCDC; +border-style:solid; +border-width:0px 0px 0px 2px; +padding:4px 4px 4px 2px; +border-color:#00BB9E; +background-color:#444444; +} + +QWidget[video="true"] QLabel{ +color:#DCDCDC; +border:1px solid #242424; +background:qlineargradient(spread:pad,x1:0,y1:0,x2:0,y2:1,stop:0 #484848,stop:1 #383838); +} + +QWidget[video="true"] QLabel:focus{ +border:1px solid #00BB9E; +background:qlineargradient(spread:pad,x1:0,y1:0,x2:0,y2:1,stop:0 #646464,stop:1 #525252); +} + +QLineEdit,QTextEdit,QPlainTextEdit,QSpinBox,QDoubleSpinBox,QComboBox,QDateEdit,QTimeEdit,QDateTimeEdit{ +border:1px solid #242424; +border-radius:3px; +padding:2px; +background:none; +selection-background-color:#484848; +selection-color:#DCDCDC; +} + +QLineEdit:focus,QTextEdit:focus,QPlainTextEdit:focus,QSpinBox:focus,QDoubleSpinBox:focus,QComboBox:focus,QDateEdit:focus,QTimeEdit:focus,QDateTimeEdit:focus,QLineEdit:hover,QTextEdit:hover,QPlainTextEdit:hover,QSpinBox:hover,QDoubleSpinBox:hover,QComboBox:hover,QDateEdit:hover,QTimeEdit:hover,QDateTimeEdit:hover{ +border:1px solid #242424; +} + +QLineEdit[echoMode="2"]{ +lineedit-password-character:9679; +} + +.QFrame{ +border:1px solid #242424; +border-radius:3px; +} + +.QGroupBox{ +border:1px solid #242424; +border-radius:5px; +margin-top:3ex; +} + +.QGroupBox::title{ +subcontrol-origin:margin; +position:relative; +left:10px; +} + +.QPushButton,.QToolButton{ +border-style:none; +border:1px solid #242424; +color:#DCDCDC; +padding:5px; +min-height:15px; +border-radius:5px; +background:qlineargradient(spread:pad,x1:0,y1:0,x2:0,y2:1,stop:0 #484848,stop:1 #383838); +} + +.QPushButton:hover,.QToolButton:hover{ +background:qlineargradient(spread:pad,x1:0,y1:0,x2:0,y2:1,stop:0 #646464,stop:1 #525252); +} + +.QPushButton:pressed,.QToolButton:pressed{ +background:qlineargradient(spread:pad,x1:0,y1:0,x2:0,y2:1,stop:0 #484848,stop:1 #383838); +} + +.QToolButton::menu-indicator{ +image:None; +} + +QToolButton#btnMenu,QPushButton#btnMenu_Min,QPushButton#btnMenu_Max,QPushButton#btnMenu_Close{ +border-radius:3px; +color:#DCDCDC; +padding:3px; +margin:0px; +background:none; +border-style:none; +} + +QToolButton#btnMenu:hover,QPushButton#btnMenu_Min:hover,QPushButton#btnMenu_Max:hover{ +color:#FFFFFF; +margin:1px 1px 2px 1px; +background-color:rgba(51,127,209,230); +} + +QPushButton#btnMenu_Close:hover{ +color:#FFFFFF; +margin:1px 1px 2px 1px; +background-color:rgba(238,0,0,128); +} + +QRadioButton::indicator{ +width:15px; +height:15px; +} + +QRadioButton::indicator::unchecked{ +image:url(:/qss/psblack/radiobutton_unchecked.png); +} + +QRadioButton::indicator::unchecked:disabled{ +image:url(:/qss/psblack/radiobutton_unchecked_disable.png); +} + +QRadioButton::indicator::checked{ +image:url(:/qss/psblack/radiobutton_checked.png); +} + +QRadioButton::indicator::checked:disabled{ +image:url(:/qss/psblack/radiobutton_checked_disable.png); +} + +QGroupBox::indicator,QTreeWidget::indicator,QListWidget::indicator{ +padding:0px -3px 0px 3px; +} + +QCheckBox::indicator,QGroupBox::indicator,QTreeWidget::indicator,QListWidget::indicator{ +width:13px; +height:13px; +} + +QCheckBox::indicator:unchecked,QGroupBox::indicator:unchecked,QTreeWidget::indicator:unchecked,QListWidget::indicator:unchecked{ +image:url(:/qss/psblack/checkbox_unchecked.png); +} + +QCheckBox::indicator:unchecked:disabled,QGroupBox::indicator:unchecked:disabled,QTreeWidget::indicator:unchecked:disabled,QListWidget::indicator:disabled{ +image:url(:/qss/psblack/checkbox_unchecked_disable.png); +} + +QCheckBox::indicator:checked,QGroupBox::indicator:checked,QTreeWidget::indicator:checked,QListWidget::indicator:checked{ +image:url(:/qss/psblack/checkbox_checked.png); +} + +QCheckBox::indicator:checked:disabled,QGroupBox::indicator:checked:disabled,QTreeWidget::indicator:checked:disabled,QListWidget::indicator:checked:disabled{ +image:url(:/qss/psblack/checkbox_checked_disable.png); +} + +QCheckBox::indicator:indeterminate,QGroupBox::indicator:indeterminate,QTreeWidget::indicator:indeterminate,QListWidget::indicator:indeterminate{ +image:url(:/qss/psblack/checkbox_parcial.png); +} + +QCheckBox::indicator:indeterminate:disabled,QGroupBox::indicator:indeterminate:disabled,QTreeWidget::indicator:indeterminate:disabled,QListWidget::indicator:indeterminate:disabled{ +image:url(:/qss/psblack/checkbox_parcial_disable.png); +} + +QTimeEdit::up-button,QDateEdit::up-button,QDateTimeEdit::up-button,QDoubleSpinBox::up-button,QSpinBox::up-button{ +image:url(:/qss/psblack/add_top.png); +width:10px; +height:10px; +padding:2px 5px 0px 0px; +} + +QTimeEdit::down-button,QDateEdit::down-button,QDateTimeEdit::down-button,QDoubleSpinBox::down-button,QSpinBox::down-button{ +image:url(:/qss/psblack/add_bottom.png); +width:10px; +height:10px; +padding:0px 5px 2px 0px; +} + +QTimeEdit::up-button:pressed,QDateEdit::up-button:pressed,QDateTimeEdit::up-button:pressed,QDoubleSpinBox::up-button:pressed,QSpinBox::up-button:pressed{ +top:-2px; +} + +QTimeEdit::down-button:pressed,QDateEdit::down-button:pressed,QDateTimeEdit::down-button:pressed,QDoubleSpinBox::down-button:pressed,QSpinBox::down-button:pressed,QSpinBox::down-button:pressed{ +bottom:-2px; +} + +QComboBox::down-arrow,QDateEdit[calendarPopup="true"]::down-arrow,QTimeEdit[calendarPopup="true"]::down-arrow,QDateTimeEdit[calendarPopup="true"]::down-arrow{ +image:url(:/qss/psblack/add_bottom.png); +width:10px; +height:10px; +right:2px; +} + +QComboBox::drop-down,QDateEdit::drop-down,QTimeEdit::drop-down,QDateTimeEdit::drop-down{ +subcontrol-origin:padding; +subcontrol-position:top right; +width:15px; +border-left-width:0px; +border-left-style:solid; +border-top-right-radius:3px; +border-bottom-right-radius:3px; +border-left-color:#242424; +} + +QComboBox::drop-down:on{ +top:1px; +} + +QMenuBar::item{ +color:#DCDCDC; +background-color:#484848; +margin:0px; +padding:3px 10px; +} + +QMenu,QMenuBar,QMenu:disabled,QMenuBar:disabled{ +color:#DCDCDC; +background-color:#484848; +border:1px solid #242424; +margin:0px; +} + +QMenu::item{ +padding:3px 20px; +} + +QMenu::indicator{ +width:13px; +height:13px; +} + +QMenu::item:selected,QMenuBar::item:selected{ +color:#DCDCDC; +border:0px solid #242424; +background:#646464; +} + +QMenu::separator{ +height:1px; +background:#242424; +} + +QProgressBar{ +min-height:10px; +background:#484848; +border-radius:5px; +text-align:center; +border:1px solid #484848; +} + +QProgressBar:chunk{ +border-radius:5px; +background-color:#242424; +} + +QSlider::groove:horizontal{ +background:#484848; +height:8px; +border-radius:4px; +} + +QSlider::add-page:horizontal{ +background:#484848; +height:8px; +border-radius:4px; +} + +QSlider::sub-page:horizontal{ +background:#242424; +height:8px; +border-radius:4px; +} + +QSlider::handle:horizontal{ +width:13px; +margin-top:-3px; +margin-bottom:-3px; +border-radius:6px; +background:qradialgradient(spread:pad,cx:0.5,cy:0.5,radius:0.5,fx:0.5,fy:0.5,stop:0.6 #444444,stop:0.8 #242424); +} + +QSlider::groove:vertical{ +width:8px; +border-radius:4px; +background:#484848; +} + +QSlider::add-page:vertical{ +width:8px; +border-radius:4px; +background:#484848; +} + +QSlider::sub-page:vertical{ +width:8px; +border-radius:4px; +background:#242424; +} + +QSlider::handle:vertical{ +height:14px; +margin-left:-3px; +margin-right:-3px; +border-radius:6px; +background:qradialgradient(spread:pad,cx:0.5,cy:0.5,radius:0.5,fx:0.5,fy:0.5,stop:0.6 #444444,stop:0.8 #242424); +} + +QScrollBar:horizontal{ +background:#484848; +padding:0px; +border-radius:6px; +max-height:12px; +} + +QScrollBar::handle:horizontal{ +background:#525252; +min-width:50px; +border-radius:6px; +} + +QScrollBar::handle:horizontal:hover{ +background:#242424; +} + +QScrollBar::handle:horizontal:pressed{ +background:#242424; +} + +QScrollBar::add-page:horizontal{ +background:none; +} + +QScrollBar::sub-page:horizontal{ +background:none; +} + +QScrollBar::add-line:horizontal{ +background:none; +} + +QScrollBar::sub-line:horizontal{ +background:none; +} + +QScrollBar:vertical{ +background:#484848; +padding:0px; +border-radius:6px; +max-width:12px; +} + +QScrollBar::handle:vertical{ +background:#525252; +min-height:50px; +border-radius:6px; +} + +QScrollBar::handle:vertical:hover{ +background:#242424; +} + +QScrollBar::handle:vertical:pressed{ +background:#242424; +} + +QScrollBar::add-page:vertical{ +background:none; +} + +QScrollBar::sub-page:vertical{ +background:none; +} + +QScrollBar::add-line:vertical{ +background:none; +} + +QScrollBar::sub-line:vertical{ +background:none; +} + +QScrollArea{ +border:0px; +} + +QTreeView,QListView,QTableView,QTabWidget::pane{ +border:1px solid #242424; +selection-background-color:#646464; +selection-color:#DCDCDC; +alternate-background-color:#525252; +gridline-color:#242424; +} + +QTreeView::branch:closed:has-children{ +margin:4px; +border-image:url(:/qss/psblack/branch_open.png); +} + +QTreeView::branch:open:has-children{ +margin:4px; +border-image:url(:/qss/psblack/branch_close.png); +} + +QTreeView,QListView,QTableView,QSplitter::handle,QTreeView::branch{ +background:#444444; +} + +QTableView::item:selected,QListView::item:selected,QTreeView::item:selected{ +color:#DCDCDC; +background:qlineargradient(spread:pad,x1:0,y1:0,x2:0,y2:1,stop:0 #484848,stop:1 #383838); +} + +QTableView::item:hover,QListView::item:hover,QTreeView::item:hover{ +color:#DCDCDC; +background:qlineargradient(spread:pad,x1:0,y1:0,x2:0,y2:1,stop:0 #646464,stop:1 #525252); +} + +QTableView::item,QListView::item,QTreeView::item{ +padding:1px; +margin:0px; +} + +QHeaderView::section,QTableCornerButton:section{ +padding:3px; +margin:0px; +color:#DCDCDC; +border:1px solid #242424; +border-left-width:0px; +border-right-width:1px; +border-top-width:0px; +border-bottom-width:1px; +background:qlineargradient(spread:pad,x1:0,y1:0,x2:0,y2:1,stop:0 #646464,stop:1 #525252); +} + +QTabBar::tab{ +border:1px solid #242424; +color:#DCDCDC; +margin:0px; +background:qlineargradient(spread:pad,x1:0,y1:0,x2:0,y2:1,stop:0 #646464,stop:1 #525252); +} + +QTabBar::tab:selected,QTabBar::tab:hover{ +border-style:solid; +border-color:#00BB9E; +background:qlineargradient(spread:pad,x1:0,y1:0,x2:0,y2:1,stop:0 #484848,stop:1 #383838); +} + +QTabBar::tab:top,QTabBar::tab:bottom{ +padding:3px 8px 3px 8px; +} + +QTabBar::tab:left,QTabBar::tab:right{ +padding:8px 3px 8px 3px; +} + +QTabBar::tab:top:selected,QTabBar::tab:top:hover{ +border-width:2px 0px 0px 0px; +} + +QTabBar::tab:right:selected,QTabBar::tab:right:hover{ +border-width:0px 0px 0px 2px; +} + +QTabBar::tab:bottom:selected,QTabBar::tab:bottom:hover{ +border-width:0px 0px 2px 0px; +} + +QTabBar::tab:left:selected,QTabBar::tab:left:hover{ +border-width:0px 2px 0px 0px; +} + +QTabBar::tab:first:top:selected,QTabBar::tab:first:top:hover,QTabBar::tab:first:bottom:selected,QTabBar::tab:first:bottom:hover{ +border-left-width:1px; +border-left-color:#242424; +} + +QTabBar::tab:first:left:selected,QTabBar::tab:first:left:hover,QTabBar::tab:first:right:selected,QTabBar::tab:first:right:hover{ +border-top-width:1px; +border-top-color:#242424; +} + +QTabBar::tab:last:top:selected,QTabBar::tab:last:top:hover,QTabBar::tab:last:bottom:selected,QTabBar::tab:last:bottom:hover{ +border-right-width:1px; +border-right-color:#242424; +} + +QTabBar::tab:last:left:selected,QTabBar::tab:last:left:hover,QTabBar::tab:last:right:selected,QTabBar::tab:last:right:hover{ +border-bottom-width:1px; +border-bottom-color:#242424; +} + +QStatusBar::item{ +border:0px solid #484848; +border-radius:3px; +} + +QToolBox::tab,QGroupBox#gboxDevicePanel,QGroupBox#gboxDeviceTitle,QFrame#gboxDevicePanel,QFrame#gboxDeviceTitle{ +padding:3px; +border-radius:5px; +color:#DCDCDC; +background:qlineargradient(spread:pad,x1:0,y1:0,x2:0,y2:1,stop:0 #484848,stop:1 #383838); +} + +QToolTip{ +border:0px solid #DCDCDC; +padding:1px; +color:#DCDCDC; +background:qlineargradient(spread:pad,x1:0,y1:0,x2:0,y2:1,stop:0 #484848,stop:1 #383838); +} + +QToolBox::tab:selected{ +background:qlineargradient(spread:pad,x1:0,y1:0,x2:0,y2:1,stop:0 #646464,stop:1 #525252); +} + +QPrintPreviewDialog QToolButton{ +border:0px solid #DCDCDC; +border-radius:0px; +margin:0px; +padding:3px; +background:none; +} + +QColorDialog QPushButton,QFileDialog QPushButton{ +min-width:80px; +} + +QToolButton#qt_calendar_prevmonth{ +icon-size:0px; +min-width:20px; +image:url(:/qss/psblack/calendar_prevmonth.png); +} + +QToolButton#qt_calendar_nextmonth{ +icon-size:0px; +min-width:20px; +image:url(:/qss/psblack/calendar_nextmonth.png); +} + +QToolButton#qt_calendar_prevmonth,QToolButton#qt_calendar_nextmonth,QToolButton#qt_calendar_monthbutton,QToolButton#qt_calendar_yearbutton{ +border:0px solid #DCDCDC; +border-radius:3px; +margin:3px 3px 3px 3px; +padding:3px; +background:none; +} + +QToolButton#qt_calendar_prevmonth:hover,QToolButton#qt_calendar_nextmonth:hover,QToolButton#qt_calendar_monthbutton:hover,QToolButton#qt_calendar_yearbutton:hover,QToolButton#qt_calendar_prevmonth:pressed,QToolButton#qt_calendar_nextmonth:pressed,QToolButton#qt_calendar_monthbutton:pressed,QToolButton#qt_calendar_yearbutton:pressed{ +border:1px solid #242424; +} + +QCalendarWidget QSpinBox#qt_calendar_yearedit{ +margin:2px; +} + +QCalendarWidget QToolButton::menu-indicator{ +image:None; +} + +QCalendarWidget QTableView{ +border-width:0px; +} + +QCalendarWidget QWidget#qt_calendar_navigationbar{ +border:1px solid #242424; +border-width:1px 1px 0px 1px; +background:qlineargradient(spread:pad,x1:0,y1:0,x2:0,y2:1,stop:0 #484848,stop:1 #383838); +} + +QComboBox QAbstractItemView::item{ +min-height:20px; +min-width:10px; +} + +QTableView[model="true"]::item{ +padding:0px; +margin:0px; +} + +QTableView QLineEdit,QTableView QComboBox,QTableView QSpinBox,QTableView QDoubleSpinBox,QTableView QDateEdit,QTableView QTimeEdit,QTableView QDateTimeEdit{ +border-width:0px; +border-radius:0px; +} + +QTableView QLineEdit:focus,QTableView QComboBox:focus,QTableView QSpinBox:focus,QTableView QDoubleSpinBox:focus,QTableView QDateEdit:focus,QTableView QTimeEdit:focus,QTableView QDateTimeEdit:focus{ +border-width:0px; +border-radius:0px; +} + +QLineEdit,QTextEdit,QPlainTextEdit,QSpinBox,QDoubleSpinBox,QComboBox,QDateEdit,QTimeEdit,QDateTimeEdit{ +background:#444444; +} + +*:disabled{ +background:#444444; +border-color:#484848; +} + +/*TextColor:#DCDCDC*/ +/*PanelColor:#444444*/ +/*BorderColor:#242424*/ +/*NormalColorStart:#484848*/ +/*NormalColorEnd:#383838*/ +/*DarkColorStart:#646464*/ +/*DarkColorEnd:#525252*/ /*HighColor:#00BB9E*/ \ No newline at end of file diff --git a/QtScrcpy/res/qss/psblack/add_bottom.png b/QtScrcpy/res/qss/psblack/add_bottom.png new file mode 100644 index 0000000..2f8c0f2 Binary files /dev/null and b/QtScrcpy/res/qss/psblack/add_bottom.png differ diff --git a/QtScrcpy/res/qss/psblack/add_left.png b/QtScrcpy/res/qss/psblack/add_left.png new file mode 100644 index 0000000..7a23601 Binary files /dev/null and b/QtScrcpy/res/qss/psblack/add_left.png differ diff --git a/QtScrcpy/res/qss/psblack/add_right.png b/QtScrcpy/res/qss/psblack/add_right.png new file mode 100644 index 0000000..d01c2f7 Binary files /dev/null and b/QtScrcpy/res/qss/psblack/add_right.png differ diff --git a/QtScrcpy/res/qss/psblack/add_top.png b/QtScrcpy/res/qss/psblack/add_top.png new file mode 100644 index 0000000..a5ceb4f Binary files /dev/null and b/QtScrcpy/res/qss/psblack/add_top.png differ diff --git a/QtScrcpy/res/qss/psblack/branch_close.png b/QtScrcpy/res/qss/psblack/branch_close.png new file mode 100644 index 0000000..94511e5 Binary files /dev/null and b/QtScrcpy/res/qss/psblack/branch_close.png differ diff --git a/QtScrcpy/res/qss/psblack/branch_open.png b/QtScrcpy/res/qss/psblack/branch_open.png new file mode 100644 index 0000000..533a63e Binary files /dev/null and b/QtScrcpy/res/qss/psblack/branch_open.png differ diff --git a/QtScrcpy/res/qss/psblack/calendar_nextmonth.png b/QtScrcpy/res/qss/psblack/calendar_nextmonth.png new file mode 100644 index 0000000..c80aa2a Binary files /dev/null and b/QtScrcpy/res/qss/psblack/calendar_nextmonth.png differ diff --git a/QtScrcpy/res/qss/psblack/calendar_prevmonth.png b/QtScrcpy/res/qss/psblack/calendar_prevmonth.png new file mode 100644 index 0000000..421799e Binary files /dev/null and b/QtScrcpy/res/qss/psblack/calendar_prevmonth.png differ diff --git a/QtScrcpy/res/qss/psblack/checkbox_checked.png b/QtScrcpy/res/qss/psblack/checkbox_checked.png new file mode 100644 index 0000000..55a120c Binary files /dev/null and b/QtScrcpy/res/qss/psblack/checkbox_checked.png differ diff --git a/QtScrcpy/res/qss/psblack/checkbox_checked_disable.png b/QtScrcpy/res/qss/psblack/checkbox_checked_disable.png new file mode 100644 index 0000000..fa51554 Binary files /dev/null and b/QtScrcpy/res/qss/psblack/checkbox_checked_disable.png differ diff --git a/QtScrcpy/res/qss/psblack/checkbox_parcial.png b/QtScrcpy/res/qss/psblack/checkbox_parcial.png new file mode 100644 index 0000000..e6ae0b8 Binary files /dev/null and b/QtScrcpy/res/qss/psblack/checkbox_parcial.png differ diff --git a/QtScrcpy/res/qss/psblack/checkbox_parcial_disable.png b/QtScrcpy/res/qss/psblack/checkbox_parcial_disable.png new file mode 100644 index 0000000..eca2c61 Binary files /dev/null and b/QtScrcpy/res/qss/psblack/checkbox_parcial_disable.png differ diff --git a/QtScrcpy/res/qss/psblack/checkbox_unchecked.png b/QtScrcpy/res/qss/psblack/checkbox_unchecked.png new file mode 100644 index 0000000..b06fd70 Binary files /dev/null and b/QtScrcpy/res/qss/psblack/checkbox_unchecked.png differ diff --git a/QtScrcpy/res/qss/psblack/checkbox_unchecked_disable.png b/QtScrcpy/res/qss/psblack/checkbox_unchecked_disable.png new file mode 100644 index 0000000..db00b2a Binary files /dev/null and b/QtScrcpy/res/qss/psblack/checkbox_unchecked_disable.png differ diff --git a/QtScrcpy/res/qss/psblack/radiobutton_checked.png b/QtScrcpy/res/qss/psblack/radiobutton_checked.png new file mode 100644 index 0000000..928307c Binary files /dev/null and b/QtScrcpy/res/qss/psblack/radiobutton_checked.png differ diff --git a/QtScrcpy/res/qss/psblack/radiobutton_checked_disable.png b/QtScrcpy/res/qss/psblack/radiobutton_checked_disable.png new file mode 100644 index 0000000..436b8ea Binary files /dev/null and b/QtScrcpy/res/qss/psblack/radiobutton_checked_disable.png differ diff --git a/QtScrcpy/res/qss/psblack/radiobutton_unchecked.png b/QtScrcpy/res/qss/psblack/radiobutton_unchecked.png new file mode 100644 index 0000000..3d1e440 Binary files /dev/null and b/QtScrcpy/res/qss/psblack/radiobutton_unchecked.png differ diff --git a/QtScrcpy/res/qss/psblack/radiobutton_unchecked_disable.png b/QtScrcpy/res/qss/psblack/radiobutton_unchecked_disable.png new file mode 100644 index 0000000..d291039 Binary files /dev/null and b/QtScrcpy/res/qss/psblack/radiobutton_unchecked_disable.png differ diff --git a/QtScrcpy/res/res.qrc b/QtScrcpy/res/res.qrc new file mode 100644 index 0000000..834014b --- /dev/null +++ b/QtScrcpy/res/res.qrc @@ -0,0 +1,30 @@ + + + font/fontawesome-webfont.ttf + image/videoform/phone-h.png + image/videoform/phone-v.png + qml/pinwheel.qml + qml/images/pinwheel.png + qss/psblack.css + qss/psblack/add_bottom.png + qss/psblack/add_left.png + qss/psblack/add_right.png + qss/psblack/add_top.png + qss/psblack/branch_close.png + qss/psblack/branch_open.png + qss/psblack/calendar_nextmonth.png + qss/psblack/calendar_prevmonth.png + qss/psblack/checkbox_checked.png + qss/psblack/checkbox_checked_disable.png + qss/psblack/checkbox_parcial.png + qss/psblack/checkbox_parcial_disable.png + qss/psblack/checkbox_unchecked.png + qss/psblack/checkbox_unchecked_disable.png + qss/psblack/radiobutton_checked.png + qss/psblack/radiobutton_checked_disable.png + qss/psblack/radiobutton_unchecked.png + qss/psblack/radiobutton_unchecked_disable.png + i18n/QtScrcpy_en.qm + i18n/QtScrcpy_zh.qm + + diff --git a/QtScrcpy/videoform.cpp b/QtScrcpy/videoform.cpp index 9e4f5d4..f3f7775 100644 --- a/QtScrcpy/videoform.cpp +++ b/QtScrcpy/videoform.cpp @@ -235,7 +235,7 @@ void VideoForm::updateStyleSheet(bool vertical) if (vertical) { setStyleSheet(R"( #videoForm { - border-image: url(:/res/phone-v.png) 150px 142px 85px 142px; + border-image: url(:/image/videoform/phone-v.png) 150px 142px 85px 142px; border-width: 150px 142px 85px 142px; } )"); @@ -243,7 +243,7 @@ void VideoForm::updateStyleSheet(bool vertical) } else { setStyleSheet(R"( #videoForm { - border-image: url(:/res/phone-h.png) 142px 85px 142px 150px; + border-image: url(:/image/videoform/phone-h.png) 142px 85px 142px 150px; border-width: 142px 85px 142px 150px; } )"); diff --git a/TODO.txt b/TODO.txt index 1de3362..1f1e7df 100644 --- a/TODO.txt +++ b/TODO.txt @@ -11,8 +11,6 @@ b35733edb6df2a00b6af9b1c98627d344c377963 ֻ¼ƲڣعĿǰvideoform ֡Ϊ̬ãǾ̬ https://github.com/Genymobile/scrcpy/commit/ebccb9f6cc111e8acfbe10d656cac5c1f1b744a0 -ճԱ -ճIJ ʻ ̴߳ӡ֡ https://github.com/Genymobile/scrcpy/commit/e2a272bf99ecf48fcb050177113f903b3fb323c4 عinput diff --git a/all.pro b/all.pro index 8e07ee8..aa4e301 100644 --- a/all.pro +++ b/all.pro @@ -3,5 +3,5 @@ SUBDIRS = QtScrcpy # 多语言翻译文件 TRANSLATIONS = \ - $$PWD/QtScrcpy/i18n/QtScrcpy_zh.ts \ - $$PWD/QtScrcpy/i18n/QtScrcpy_en.ts + $$PWD/QtScrcpy/res/i18n/QtScrcpy_zh.ts \ + $$PWD/QtScrcpy/res/i18n/QtScrcpy_en.ts