hashirama/goldendict-ng
hashirama/goldendict-ng
0
0
Fork 0
mirror of https://github.com/xiaoyifang/goldendict-ng.git synced 2024-11-24 12:44:07 +00:00
Code Issues Actions 1 Projects Releases Wiki Activity

Merge branch 'staged' into dev

Browse source
This commit is contained in:
Xiao YiFang 2023-02-05 20:24:29 +08:00
parent 698c02ed6c a16dba22e3
commit e188ad95f2
2 changed files with 20 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
mdx.cc
View file

@ -1603,8 +1603,8 @@ vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & f
idxHeader.formatVersion = kCurrentFormatVersion; idxHeader.formatVersion = kCurrentFormatVersion;
idxHeader.parserVersion = MdictParser::kParserVersion; idxHeader.parserVersion = MdictParser::kParserVersion;
idxHeader.foldingVersion = Folding::Version; idxHeader.foldingVersion = Folding::Version;
idxHeader.articleCount = indexedWords.size(); idxHeader.articleCount = parser.wordCount();
idxHeader.wordCount = indexedWords.size(); idxHeader.wordCount = parser.wordCount();
idx.rewind(); idx.rewind();
idx.write( &idxHeader, sizeof( idxHeader ) ); idx.write( &idxHeader, sizeof( idxHeader ) );

43
qt-style.css
View file

@ -1,9 +1,6 @@
MainWindow #translateLine, ScanPopup #translateLine, MainWindow #wordList, MainWindow #dictsPane #dictsList, MainWindow #historyPane #historyList, MainWindow #favoritesPane #favoritesTree { MainWindow #translateLine, ScanPopup #translateLine, MainWindow #wordList, MainWindow #dictsPane #dictsList, MainWindow #historyPane #historyList, MainWindow #favoritesPane #favoritesTree {
} }
#translateLine {
color: palette(Text); /* ensure the text is inverse of the background, and also placehold text is grey */
}
#translateLine[noResults="true"] { #translateLine[noResults="true"] {
background: #febb7d; background: #febb7d;
@ -13,19 +10,27 @@ MainWindow #translateLine, ScanPopup #translateLine, MainWindow #wordList, MainW
image: none; image: none;
} }
#navToolbar #translateLine { #translateLine {
color: palette(Text); /* ensure the text is inverse of the background, and also placehold text is grey */
margin-left: 0;
padding: 1px 3px 1px 3px;
border: 1px solid gray; border: 1px solid gray;
border-left: 0; /* When not in #searchPane the border-left is provided by GroupComboBox */
border-radius: 3px; border-radius: 3px;
padding: 1px 3px 2px 3px;
border-top-left-radius: 0; border-top-left-radius: 0;
border-bottom-left-radius: 0; border-bottom-left-radius: 0;
margin-left: 0; }
#searchPane #translateLine {
border: 1px solid gray;
border-radius: 0;
} }
GroupComboBox { GroupComboBox {
margin-right: 0; margin-right: 0;
border: 1px solid gray; border: 1px solid gray;
border-right: 1px transparent;
border-radius: 3px; border-radius: 3px;
border-top-right-radius: 0; border-top-right-radius: 0;
border-bottom-right-radius: 0; border-bottom-right-radius: 0;
@ -35,22 +40,20 @@ GroupComboBox {
color: palette(Text); color: palette(Text);
} }
GroupComboBox:on { #searchPane GroupComboBox{
padding: 3px 3px 1px 5px; border-radius: 3px;
} }
GroupComboBox::drop-down { GroupComboBox::drop-down {
subcontrol-origin: padding; subcontrol-origin: padding;
subcontrol-position: top right; subcontrol-position: top right;
width: 15px; width: 15px;
border-left: 1px solid darkgray; border-left: 1px solid gray;
border-right: 1px transparent; border-right: 1px transparent;
/* Hack: For unknown reason, if the padding right is unset, the drop-down won't show full content */ /* Hack: Padding must be >= 2px, or the drop-down won't show full content */
padding-right: 4px; padding-left: 2px;
border-right: 1px solid darkgray; padding-right: 2px;
/* Hack: end*/
} }
GroupComboBox::down-arrow { GroupComboBox::down-arrow {
@ -79,16 +82,6 @@ MainStatusBar #icon {
padding-right: 0; padding-right: 0;
} }
ScanPopup #translateLine {
margin: 0;
padding: 1px 3px 1px 3px;
border: 1px solid gray;
border-radius: 3px;
border-top-left-radius: 0;
border-bottom-left-radius: 0;
}
.ScanPopup #outerFrame { .ScanPopup #outerFrame {
border: 1px solid palette(dark); border: 1px solid palette(dark);
} }