chore: minor changes related to HiDIP, fork, etc.
This commit is contained in:
parent
1074dddba6
commit
a97e2126f0
@ -7,4 +7,11 @@ based on Caesium 1.7.0. You can get the original source code at [here](https://s
|
|||||||
- Remove country/region flags since the original filename have encoding issue which can cause a build failure, and also to avoid some potential regional internationalization issues. (216e1a9)
|
- Remove country/region flags since the original filename have encoding issue which can cause a build failure, and also to avoid some potential regional internationalization issues. (216e1a9)
|
||||||
- Resolution display as -1x-1 for some images with unregular filename (e.g. `2IGYT%BD]SYY77Q7R041(WD.jpg` and `G9E@W$_Y4GYMWJY)%R24X~2.jpg`): Recompile under newer Qt version should works. Original Caesium official binary comes with Qt 5.1.0, Recompiled and tested under Qt 5.15.2.
|
- Resolution display as -1x-1 for some images with unregular filename (e.g. `2IGYT%BD]SYY77Q7R041(WD.jpg` and `G9E@W$_Y4GYMWJY)%R24X~2.jpg`): Recompile under newer Qt version should works. Original Caesium official binary comes with Qt 5.1.0, Recompiled and tested under Qt 5.15.2.
|
||||||
- Click "Auto preview" checkbox and then click any image item will lead a crash. (0e3d5c5)
|
- Click "Auto preview" checkbox and then click any image item will lead a crash. (0e3d5c5)
|
||||||
|
- Rework the language selection part, no longer depends on language filename and no longer have encoding issue. (c641be3)
|
||||||
|
- Port away from deprecated Qt APIs. (53a7ee1)
|
||||||
|
- Update zh_CN translations, align translation locale code to the one descripted inside the ts file. (1074ddd)
|
||||||
|
|
||||||
|
### Non-issue changes
|
||||||
|
|
||||||
|
- UI tweaks: Hi-DPI-aware window size and text, use Qt logo from Qt built-in resource.
|
||||||
|
- (temporary) disable update checker (since this is a forked version and the update checker request the orginal version url for checking updates).
|
||||||
|
18
caesium.cpp
18
caesium.cpp
@ -336,6 +336,7 @@ Caesium::Caesium(QWidget *parent) :
|
|||||||
Caesium::openList(QDir::tempPath() + "/_caesium_/tmplst");
|
Caesium::openList(QDir::tempPath() + "/_caesium_/tmplst");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ui->actionAbout_Qt->setIcon(QIcon(QLatin1String(":/qt-project.org/qmessagebox/images/qtlogo-64.png")));
|
||||||
}
|
}
|
||||||
|
|
||||||
Caesium::~Caesium()
|
Caesium::~Caesium()
|
||||||
@ -648,7 +649,7 @@ void Caesium::on_actionDonate_to_Caesium_triggered()
|
|||||||
void Caesium::on_browseToolButton_clicked()
|
void Caesium::on_browseToolButton_clicked()
|
||||||
{
|
{
|
||||||
QString outputPath = QFileDialog::getExistingDirectory(this, tr("Select output directory"),
|
QString outputPath = QFileDialog::getExistingDirectory(this, tr("Select output directory"),
|
||||||
"/home",
|
QDir::homePath(),
|
||||||
QFileDialog::ShowDirsOnly
|
QFileDialog::ShowDirsOnly
|
||||||
| QFileDialog::DontResolveSymlinks);
|
| QFileDialog::DontResolveSymlinks);
|
||||||
if (outputPath != "")
|
if (outputPath != "")
|
||||||
@ -771,18 +772,23 @@ void Caesium::on_actionAbout_Qt_triggered()
|
|||||||
|
|
||||||
void Caesium::on_actionCheck_for_Updates_triggered()
|
void Caesium::on_actionCheck_for_Updates_triggered()
|
||||||
{
|
{
|
||||||
ui->actionCheck_for_Updates->setEnabled(false);
|
QMessageBox::information(this,
|
||||||
|
tr("Information"),
|
||||||
|
tr("You are currently using a forked version of Caesium.\n"
|
||||||
|
"Update checker is temporary not available."),
|
||||||
|
QMessageBox::Ok);
|
||||||
|
// ui->actionCheck_for_Updates->setEnabled(false);
|
||||||
|
|
||||||
updater = new Updater(this);
|
// updater = new Updater(this);
|
||||||
updater->show();
|
// updater->show();
|
||||||
|
|
||||||
ui->actionCheck_for_Updates->setEnabled(true);
|
// ui->actionCheck_for_Updates->setEnabled(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void Caesium::checkForUpdateStartup()
|
void Caesium::checkForUpdateStartup()
|
||||||
{
|
{
|
||||||
if (!settings.value("Preferences/startupupdt").value<bool>())
|
if (!settings.value("Preferences/startupupdt").value<bool>() || true /* disable since this is a fork */)
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
95
caesium.ui
95
caesium.ui
@ -963,6 +963,15 @@
|
|||||||
</color>
|
</color>
|
||||||
</brush>
|
</brush>
|
||||||
</colorrole>
|
</colorrole>
|
||||||
|
<colorrole role="PlaceholderText">
|
||||||
|
<brush brushstyle="NoBrush">
|
||||||
|
<color alpha="128">
|
||||||
|
<red>255</red>
|
||||||
|
<green>0</green>
|
||||||
|
<blue>0</blue>
|
||||||
|
</color>
|
||||||
|
</brush>
|
||||||
|
</colorrole>
|
||||||
</active>
|
</active>
|
||||||
<inactive>
|
<inactive>
|
||||||
<colorrole role="WindowText">
|
<colorrole role="WindowText">
|
||||||
@ -983,6 +992,15 @@
|
|||||||
</color>
|
</color>
|
||||||
</brush>
|
</brush>
|
||||||
</colorrole>
|
</colorrole>
|
||||||
|
<colorrole role="PlaceholderText">
|
||||||
|
<brush brushstyle="NoBrush">
|
||||||
|
<color alpha="128">
|
||||||
|
<red>255</red>
|
||||||
|
<green>0</green>
|
||||||
|
<blue>0</blue>
|
||||||
|
</color>
|
||||||
|
</brush>
|
||||||
|
</colorrole>
|
||||||
</inactive>
|
</inactive>
|
||||||
<disabled>
|
<disabled>
|
||||||
<colorrole role="WindowText">
|
<colorrole role="WindowText">
|
||||||
@ -1003,6 +1021,15 @@
|
|||||||
</color>
|
</color>
|
||||||
</brush>
|
</brush>
|
||||||
</colorrole>
|
</colorrole>
|
||||||
|
<colorrole role="PlaceholderText">
|
||||||
|
<brush brushstyle="NoBrush">
|
||||||
|
<color alpha="128">
|
||||||
|
<red>255</red>
|
||||||
|
<green>0</green>
|
||||||
|
<blue>0</blue>
|
||||||
|
</color>
|
||||||
|
</brush>
|
||||||
|
</colorrole>
|
||||||
</disabled>
|
</disabled>
|
||||||
</palette>
|
</palette>
|
||||||
</property>
|
</property>
|
||||||
@ -1315,6 +1342,15 @@
|
|||||||
</color>
|
</color>
|
||||||
</brush>
|
</brush>
|
||||||
</colorrole>
|
</colorrole>
|
||||||
|
<colorrole role="PlaceholderText">
|
||||||
|
<brush brushstyle="NoBrush">
|
||||||
|
<color alpha="128">
|
||||||
|
<red>0</red>
|
||||||
|
<green>0</green>
|
||||||
|
<blue>0</blue>
|
||||||
|
</color>
|
||||||
|
</brush>
|
||||||
|
</colorrole>
|
||||||
</active>
|
</active>
|
||||||
<inactive>
|
<inactive>
|
||||||
<colorrole role="WindowText">
|
<colorrole role="WindowText">
|
||||||
@ -1452,6 +1488,15 @@
|
|||||||
</color>
|
</color>
|
||||||
</brush>
|
</brush>
|
||||||
</colorrole>
|
</colorrole>
|
||||||
|
<colorrole role="PlaceholderText">
|
||||||
|
<brush brushstyle="NoBrush">
|
||||||
|
<color alpha="128">
|
||||||
|
<red>0</red>
|
||||||
|
<green>0</green>
|
||||||
|
<blue>0</blue>
|
||||||
|
</color>
|
||||||
|
</brush>
|
||||||
|
</colorrole>
|
||||||
</inactive>
|
</inactive>
|
||||||
<disabled>
|
<disabled>
|
||||||
<colorrole role="WindowText">
|
<colorrole role="WindowText">
|
||||||
@ -1589,6 +1634,15 @@
|
|||||||
</color>
|
</color>
|
||||||
</brush>
|
</brush>
|
||||||
</colorrole>
|
</colorrole>
|
||||||
|
<colorrole role="PlaceholderText">
|
||||||
|
<brush brushstyle="NoBrush">
|
||||||
|
<color alpha="128">
|
||||||
|
<red>0</red>
|
||||||
|
<green>0</green>
|
||||||
|
<blue>0</blue>
|
||||||
|
</color>
|
||||||
|
</brush>
|
||||||
|
</colorrole>
|
||||||
</disabled>
|
</disabled>
|
||||||
</palette>
|
</palette>
|
||||||
</property>
|
</property>
|
||||||
@ -1607,8 +1661,8 @@
|
|||||||
<widget class="QWidget" name="scrollAreaWidgetContents_4">
|
<widget class="QWidget" name="scrollAreaWidgetContents_4">
|
||||||
<property name="geometry">
|
<property name="geometry">
|
||||||
<rect>
|
<rect>
|
||||||
<x>53</x>
|
<x>39</x>
|
||||||
<y>17</y>
|
<y>13</y>
|
||||||
<width>176</width>
|
<width>176</width>
|
||||||
<height>223</height>
|
<height>223</height>
|
||||||
</rect>
|
</rect>
|
||||||
@ -1762,6 +1816,15 @@
|
|||||||
</color>
|
</color>
|
||||||
</brush>
|
</brush>
|
||||||
</colorrole>
|
</colorrole>
|
||||||
|
<colorrole role="PlaceholderText">
|
||||||
|
<brush brushstyle="NoBrush">
|
||||||
|
<color alpha="128">
|
||||||
|
<red>0</red>
|
||||||
|
<green>0</green>
|
||||||
|
<blue>0</blue>
|
||||||
|
</color>
|
||||||
|
</brush>
|
||||||
|
</colorrole>
|
||||||
</active>
|
</active>
|
||||||
<inactive>
|
<inactive>
|
||||||
<colorrole role="WindowText">
|
<colorrole role="WindowText">
|
||||||
@ -1899,6 +1962,15 @@
|
|||||||
</color>
|
</color>
|
||||||
</brush>
|
</brush>
|
||||||
</colorrole>
|
</colorrole>
|
||||||
|
<colorrole role="PlaceholderText">
|
||||||
|
<brush brushstyle="NoBrush">
|
||||||
|
<color alpha="128">
|
||||||
|
<red>0</red>
|
||||||
|
<green>0</green>
|
||||||
|
<blue>0</blue>
|
||||||
|
</color>
|
||||||
|
</brush>
|
||||||
|
</colorrole>
|
||||||
</inactive>
|
</inactive>
|
||||||
<disabled>
|
<disabled>
|
||||||
<colorrole role="WindowText">
|
<colorrole role="WindowText">
|
||||||
@ -2036,6 +2108,15 @@
|
|||||||
</color>
|
</color>
|
||||||
</brush>
|
</brush>
|
||||||
</colorrole>
|
</colorrole>
|
||||||
|
<colorrole role="PlaceholderText">
|
||||||
|
<brush brushstyle="NoBrush">
|
||||||
|
<color alpha="128">
|
||||||
|
<red>0</red>
|
||||||
|
<green>0</green>
|
||||||
|
<blue>0</blue>
|
||||||
|
</color>
|
||||||
|
</brush>
|
||||||
|
</colorrole>
|
||||||
</disabled>
|
</disabled>
|
||||||
</palette>
|
</palette>
|
||||||
</property>
|
</property>
|
||||||
@ -2054,8 +2135,8 @@
|
|||||||
<widget class="QWidget" name="scrollAreaWidgetContents">
|
<widget class="QWidget" name="scrollAreaWidgetContents">
|
||||||
<property name="geometry">
|
<property name="geometry">
|
||||||
<rect>
|
<rect>
|
||||||
<x>53</x>
|
<x>39</x>
|
||||||
<y>16</y>
|
<y>13</y>
|
||||||
<width>176</width>
|
<width>176</width>
|
||||||
<height>223</height>
|
<height>223</height>
|
||||||
</rect>
|
</rect>
|
||||||
@ -2207,7 +2288,7 @@
|
|||||||
<x>0</x>
|
<x>0</x>
|
||||||
<y>0</y>
|
<y>0</y>
|
||||||
<width>1250</width>
|
<width>1250</width>
|
||||||
<height>21</height>
|
<height>25</height>
|
||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
<widget class="QMenu" name="menuFile">
|
<widget class="QMenu" name="menuFile">
|
||||||
@ -2471,10 +2552,6 @@
|
|||||||
</property>
|
</property>
|
||||||
</action>
|
</action>
|
||||||
<action name="actionAbout_Qt">
|
<action name="actionAbout_Qt">
|
||||||
<property name="icon">
|
|
||||||
<iconset resource="icons.qrc">
|
|
||||||
<normaloff>:/icons/qt.png</normaloff>:/icons/qt.png</iconset>
|
|
||||||
</property>
|
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>About Qt</string>
|
<string>About Qt</string>
|
||||||
</property>
|
</property>
|
||||||
|
@ -16,7 +16,6 @@
|
|||||||
<file>icons/plus.png</file>
|
<file>icons/plus.png</file>
|
||||||
<file>icons/preview.png</file>
|
<file>icons/preview.png</file>
|
||||||
<file>icons/processing.png</file>
|
<file>icons/processing.png</file>
|
||||||
<file>icons/qt.png</file>
|
|
||||||
<file>icons/real_size.png</file>
|
<file>icons/real_size.png</file>
|
||||||
<file>icons/remove.png</file>
|
<file>icons/remove.png</file>
|
||||||
<file>icons/savelist.png</file>
|
<file>icons/savelist.png</file>
|
||||||
|
BIN
icons/qt.png
BIN
icons/qt.png
Binary file not shown.
Before Width: | Height: | Size: 9.9 KiB |
@ -114,7 +114,7 @@ void Preferences::loadSettings()
|
|||||||
void Preferences::on_browseToolButton_clicked()
|
void Preferences::on_browseToolButton_clicked()
|
||||||
{
|
{
|
||||||
QString outputPath = QFileDialog::getExistingDirectory(this, tr("Select default output directory"),
|
QString outputPath = QFileDialog::getExistingDirectory(this, tr("Select default output directory"),
|
||||||
"/home",
|
QDir::homePath(),
|
||||||
QFileDialog::ShowDirsOnly
|
QFileDialog::ShowDirsOnly
|
||||||
| QFileDialog::DontResolveSymlinks);
|
| QFileDialog::DontResolveSymlinks);
|
||||||
if (outputPath != "")
|
if (outputPath != "")
|
||||||
|
@ -9,8 +9,8 @@
|
|||||||
<rect>
|
<rect>
|
||||||
<x>0</x>
|
<x>0</x>
|
||||||
<y>0</y>
|
<y>0</y>
|
||||||
<width>525</width>
|
<width>560</width>
|
||||||
<height>400</height>
|
<height>448</height>
|
||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
<property name="minimumSize">
|
<property name="minimumSize">
|
||||||
@ -46,13 +46,13 @@
|
|||||||
</property>
|
</property>
|
||||||
<property name="minimumSize">
|
<property name="minimumSize">
|
||||||
<size>
|
<size>
|
||||||
<width>110</width>
|
<width>120</width>
|
||||||
<height>0</height>
|
<height>0</height>
|
||||||
</size>
|
</size>
|
||||||
</property>
|
</property>
|
||||||
<property name="maximumSize">
|
<property name="maximumSize">
|
||||||
<size>
|
<size>
|
||||||
<width>110</width>
|
<width>120</width>
|
||||||
<height>16777215</height>
|
<height>16777215</height>
|
||||||
</size>
|
</size>
|
||||||
</property>
|
</property>
|
||||||
@ -154,25 +154,6 @@
|
|||||||
</property>
|
</property>
|
||||||
<item row="0" column="0" colspan="2">
|
<item row="0" column="0" colspan="2">
|
||||||
<layout class="QGridLayout" name="gridLayout">
|
<layout class="QGridLayout" name="gridLayout">
|
||||||
<item row="0" column="0">
|
|
||||||
<widget class="QCheckBox" name="useDefaultPathCheckBox">
|
|
||||||
<property name="sizePolicy">
|
|
||||||
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
|
|
||||||
<horstretch>0</horstretch>
|
|
||||||
<verstretch>0</verstretch>
|
|
||||||
</sizepolicy>
|
|
||||||
</property>
|
|
||||||
<property name="locale">
|
|
||||||
<locale language="English" country="UnitedStates"/>
|
|
||||||
</property>
|
|
||||||
<property name="text">
|
|
||||||
<string>Use a default output directory if none is specified</string>
|
|
||||||
</property>
|
|
||||||
<property name="tristate">
|
|
||||||
<bool>false</bool>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="1" column="0">
|
<item row="1" column="0">
|
||||||
<widget class="QLineEdit" name="defaultOutputLineEdit">
|
<widget class="QLineEdit" name="defaultOutputLineEdit">
|
||||||
<property name="enabled">
|
<property name="enabled">
|
||||||
@ -193,6 +174,25 @@
|
|||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
<item row="0" column="0" colspan="2">
|
||||||
|
<widget class="QCheckBox" name="useDefaultPathCheckBox">
|
||||||
|
<property name="sizePolicy">
|
||||||
|
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
|
||||||
|
<horstretch>0</horstretch>
|
||||||
|
<verstretch>0</verstretch>
|
||||||
|
</sizepolicy>
|
||||||
|
</property>
|
||||||
|
<property name="locale">
|
||||||
|
<locale language="English" country="UnitedStates"/>
|
||||||
|
</property>
|
||||||
|
<property name="text">
|
||||||
|
<string>Use a default output directory if none is specified</string>
|
||||||
|
</property>
|
||||||
|
<property name="tristate">
|
||||||
|
<bool>false</bool>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
</layout>
|
</layout>
|
||||||
</item>
|
</item>
|
||||||
</layout>
|
</layout>
|
||||||
|
Loading…
Reference in New Issue
Block a user