Skip to content

Commit 8b8cf81

Browse files
game1024game1024
authored
Merge pull request #117 from game1024/release/v1.7
fix decimal for slideValue
2 parents 3827ac7 + 2990af3 commit 8b8cf81

File tree

6 files changed

+80
-111
lines changed

6 files changed

+80
-111
lines changed

‎OpenSpeedy_en_US.ts‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -654,16 +654,16 @@ Origin</translation>
654654
<translation>✖️%1 times</translation>
655655
</message>
656656
<message>
657-
<location filename="mainwindow.cpp" line="368"/>
658-
<location filename="mainwindow.cpp" line="382"/>
659-
<location filename="mainwindow.cpp" line="396"/>
657+
<location filename="mainwindow.cpp" line="369"/>
658+
<location filename="mainwindow.cpp" line="383"/>
659+
<location filename="mainwindow.cpp" line="397"/>
660660
<source>提示</source>
661661
<translation>Tips</translation>
662662
</message>
663663
<message>
664-
<location filename="mainwindow.cpp" line="369"/>
665-
<location filename="mainwindow.cpp" line="383"/>
666-
<location filename="mainwindow.cpp" line="397"/>
664+
<location filename="mainwindow.cpp" line="370"/>
665+
<location filename="mainwindow.cpp" line="384"/>
666+
<location filename="mainwindow.cpp" line="398"/>
667667
<source>直到重启应用后，界面的语言才会生效</source>
668668
<translation>The UI language will only take effect after restarting the application.</translation>
669669
</message>
@@ -905,55 +905,55 @@ Origin</translation>
905905
<context>
906906
<name>ProcessMonitor</name>
907907
<message>
908-
<location filename="processmonitor.cpp" line="96"/>
909-
<location filename="processmonitor.cpp" line="109"/>
908+
<location filename="processmonitor.cpp" line="82"/>
909+
<location filename="processmonitor.cpp" line="95"/>
910910
<source>搜索到%1个进程, 已过滤展示%2个</source>
911911
<translation>Found %1 processes, filtered to show %2</translation>
912912
</message>
913913
<message>
914-
<location filename="processmonitor.cpp" line="138"/>
914+
<location filename="processmonitor.cpp" line="124"/>
915915
<source>加速中</source>
916916
<translation>Accelerating</translation>
917917
</message>
918918
<message>
919-
<location filename="processmonitor.cpp" line="256"/>
920-
<location filename="processmonitor.cpp" line="306"/>
919+
<location filename="processmonitor.cpp" line="234"/>
920+
<location filename="processmonitor.cpp" line="284"/>
921921
<source>高</source>
922922
<translation>High</translation>
923923
</message>
924924
<message>
925-
<location filename="processmonitor.cpp" line="259"/>
926-
<location filename="processmonitor.cpp" line="309"/>
925+
<location filename="processmonitor.cpp" line="237"/>
926+
<location filename="processmonitor.cpp" line="287"/>
927927
<source>中</source>
928928
<translation>Medium</translation>
929929
</message>
930930
<message>
931-
<location filename="processmonitor.cpp" line="262"/>
932-
<location filename="processmonitor.cpp" line="312"/>
931+
<location filename="processmonitor.cpp" line="240"/>
932+
<location filename="processmonitor.cpp" line="290"/>
933933
<source>低</source>
934934
<translation>Low</translation>
935935
</message>
936936
<message>
937-
<location filename="processmonitor.cpp" line="265"/>
938-
<location filename="processmonitor.cpp" line="315"/>
937+
<location filename="processmonitor.cpp" line="243"/>
938+
<location filename="processmonitor.cpp" line="293"/>
939939
<source>实时</source>
940940
<translation>RT</translation>
941941
</message>
942942
<message>
943-
<location filename="processmonitor.cpp" line="268"/>
944-
<location filename="processmonitor.cpp" line="318"/>
943+
<location filename="processmonitor.cpp" line="246"/>
944+
<location filename="processmonitor.cpp" line="296"/>
945945
<source>未知</source>
946946
<translation>Unknown</translation>
947947
</message>
948948
<message>
949-
<location filename="processmonitor.cpp" line="425"/>
950-
<location filename="processmonitor.cpp" line="436"/>
949+
<location filename="processmonitor.cpp" line="393"/>
950+
<location filename="processmonitor.cpp" line="404"/>
951951
<source>正常</source>
952952
<translation>Normal</translation>
953953
</message>
954954
<message>
955-
<location filename="processmonitor.cpp" line="430"/>
956-
<location filename="processmonitor.cpp" line="441"/>
955+
<location filename="processmonitor.cpp" line="398"/>
956+
<location filename="processmonitor.cpp" line="409"/>
957957
<source>异常退出</source>
958958
<translation>Error Exit</translation>
959959
</message>

‎OpenSpeedy_zh_CN.ts‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -637,16 +637,16 @@
637637
<translation type="unfinished"></translation>
638638
</message>
639639
<message>
640-
<location filename="mainwindow.cpp" line="368"/>
641-
<location filename="mainwindow.cpp" line="382"/>
642-
<location filename="mainwindow.cpp" line="396"/>
640+
<location filename="mainwindow.cpp" line="369"/>
641+
<location filename="mainwindow.cpp" line="383"/>
642+
<location filename="mainwindow.cpp" line="397"/>
643643
<source>提示</source>
644644
<translation type="unfinished"></translation>
645645
</message>
646646
<message>
647-
<location filename="mainwindow.cpp" line="369"/>
648-
<location filename="mainwindow.cpp" line="383"/>
649-
<location filename="mainwindow.cpp" line="397"/>
647+
<location filename="mainwindow.cpp" line="370"/>
648+
<location filename="mainwindow.cpp" line="384"/>
649+
<location filename="mainwindow.cpp" line="398"/>
650650
<source>直到重启应用后，界面的语言才会生效</source>
651651
<translation type="unfinished"></translation>
652652
</message>
@@ -888,55 +888,55 @@
888888
<context>
889889
<name>ProcessMonitor</name>
890890
<message>
891-
<location filename="processmonitor.cpp" line="96"/>
892-
<location filename="processmonitor.cpp" line="109"/>
891+
<location filename="processmonitor.cpp" line="82"/>
892+
<location filename="processmonitor.cpp" line="95"/>
893893
<source>搜索到%1个进程, 已过滤展示%2个</source>
894894
<translation type="unfinished"></translation>
895895
</message>
896896
<message>
897-
<location filename="processmonitor.cpp" line="138"/>
897+
<location filename="processmonitor.cpp" line="124"/>
898898
<source>加速中</source>
899899
<translation type="unfinished"></translation>
900900
</message>
901901
<message>
902-
<location filename="processmonitor.cpp" line="256"/>
903-
<location filename="processmonitor.cpp" line="306"/>
902+
<location filename="processmonitor.cpp" line="234"/>
903+
<location filename="processmonitor.cpp" line="284"/>
904904
<source>高</source>
905905
<translation type="unfinished"></translation>
906906
</message>
907907
<message>
908-
<location filename="processmonitor.cpp" line="259"/>
909-
<location filename="processmonitor.cpp" line="309"/>
908+
<location filename="processmonitor.cpp" line="237"/>
909+
<location filename="processmonitor.cpp" line="287"/>
910910
<source>中</source>
911911
<translation type="unfinished"></translation>
912912
</message>
913913
<message>
914-
<location filename="processmonitor.cpp" line="262"/>
915-
<location filename="processmonitor.cpp" line="312"/>
914+
<location filename="processmonitor.cpp" line="240"/>
915+
<location filename="processmonitor.cpp" line="290"/>
916916
<source>低</source>
917917
<translation type="unfinished"></translation>
918918
</message>
919919
<message>
920-
<location filename="processmonitor.cpp" line="265"/>
921-
<location filename="processmonitor.cpp" line="315"/>
920+
<location filename="processmonitor.cpp" line="243"/>
921+
<location filename="processmonitor.cpp" line="293"/>
922922
<source>实时</source>
923923
<translation type="unfinished"></translation>
924924
</message>
925925
<message>
926-
<location filename="processmonitor.cpp" line="268"/>
927-
<location filename="processmonitor.cpp" line="318"/>
926+
<location filename="processmonitor.cpp" line="246"/>
927+
<location filename="processmonitor.cpp" line="296"/>
928928
<source>未知</source>
929929
<translation type="unfinished"></translation>
930930
</message>
931931
<message>
932-
<location filename="processmonitor.cpp" line="425"/>
933-
<location filename="processmonitor.cpp" line="436"/>
932+
<location filename="processmonitor.cpp" line="393"/>
933+
<location filename="processmonitor.cpp" line="404"/>
934934
<source>正常</source>
935935
<translation type="unfinished"></translation>
936936
</message>
937937
<message>
938-
<location filename="processmonitor.cpp" line="430"/>
939-
<location filename="processmonitor.cpp" line="441"/>
938+
<location filename="processmonitor.cpp" line="398"/>
939+
<location filename="processmonitor.cpp" line="409"/>
940940
<source>异常退出</source>
941941
<translation type="unfinished"></translation>
942942
</message>

‎OpenSpeedy_zh_TW.ts‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -638,16 +638,16 @@
638638
<translation type="unfinished"></translation>
639639
</message>
640640
<message>
641-
<location filename="mainwindow.cpp" line="368"/>
642-
<location filename="mainwindow.cpp" line="382"/>
643-
<location filename="mainwindow.cpp" line="396"/>
641+
<location filename="mainwindow.cpp" line="369"/>
642+
<location filename="mainwindow.cpp" line="383"/>
643+
<location filename="mainwindow.cpp" line="397"/>
644644
<source>提示</source>
645645
<translation>提示</translation>
646646
</message>
647647
<message>
648-
<location filename="mainwindow.cpp" line="369"/>
649-
<location filename="mainwindow.cpp" line="383"/>
650-
<location filename="mainwindow.cpp" line="397"/>
648+
<location filename="mainwindow.cpp" line="370"/>
649+
<location filename="mainwindow.cpp" line="384"/>
650+
<location filename="mainwindow.cpp" line="398"/>
651651
<source>直到重启应用后，界面的语言才会生效</source>
652652
<translation>直到重啟應用後，界面的語言才會生效</translation>
653653
</message>
@@ -889,55 +889,55 @@
889889
<context>
890890
<name>ProcessMonitor</name>
891891
<message>
892-
<location filename="processmonitor.cpp" line="96"/>
893-
<location filename="processmonitor.cpp" line="109"/>
892+
<location filename="processmonitor.cpp" line="82"/>
893+
<location filename="processmonitor.cpp" line="95"/>
894894
<source>搜索到%1个进程, 已过滤展示%2个</source>
895895
<translation>搜索到%1個進程，已過濾展示%2個</translation>
896896
</message>
897897
<message>
898-
<location filename="processmonitor.cpp" line="138"/>
898+
<location filename="processmonitor.cpp" line="124"/>
899899
<source>加速中</source>
900900
<translation>加速中</translation>
901901
</message>
902902
<message>
903-
<location filename="processmonitor.cpp" line="256"/>
904-
<location filename="processmonitor.cpp" line="306"/>
903+
<location filename="processmonitor.cpp" line="234"/>
904+
<location filename="processmonitor.cpp" line="284"/>
905905
<source>高</source>
906906
<translation>高</translation>
907907
</message>
908908
<message>
909-
<location filename="processmonitor.cpp" line="259"/>
910-
<location filename="processmonitor.cpp" line="309"/>
909+
<location filename="processmonitor.cpp" line="237"/>
910+
<location filename="processmonitor.cpp" line="287"/>
911911
<source>中</source>
912912
<translation>中</translation>
913913
</message>
914914
<message>
915-
<location filename="processmonitor.cpp" line="262"/>
916-
<location filename="processmonitor.cpp" line="312"/>
915+
<location filename="processmonitor.cpp" line="240"/>
916+
<location filename="processmonitor.cpp" line="290"/>
917917
<source>低</source>
918918
<translation>低</translation>
919919
</message>
920920
<message>
921-
<location filename="processmonitor.cpp" line="265"/>
922-
<location filename="processmonitor.cpp" line="315"/>
921+
<location filename="processmonitor.cpp" line="243"/>
922+
<location filename="processmonitor.cpp" line="293"/>
923923
<source>实时</source>
924924
<translation>實時</translation>
925925
</message>
926926
<message>
927-
<location filename="processmonitor.cpp" line="268"/>
928-
<location filename="processmonitor.cpp" line="318"/>
927+
<location filename="processmonitor.cpp" line="246"/>
928+
<location filename="processmonitor.cpp" line="296"/>
929929
<source>未知</source>
930930
<translation>未知</translation>
931931
</message>
932932
<message>
933-
<location filename="processmonitor.cpp" line="425"/>
934-
<location filename="processmonitor.cpp" line="436"/>
933+
<location filename="processmonitor.cpp" line="393"/>
934+
<location filename="processmonitor.cpp" line="404"/>
935935
<source>正常</source>
936936
<translation>正常</translation>
937937
</message>
938938
<message>
939-
<location filename="processmonitor.cpp" line="430"/>
940-
<location filename="processmonitor.cpp" line="441"/>
939+
<location filename="processmonitor.cpp" line="398"/>
940+
<location filename="processmonitor.cpp" line="409"/>
941941
<source>异常退出</source>
942942
<translation>異常退出</translation>
943943
</message>

‎mainwindow.cpp‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,16 +210,17 @@ MainWindow::sliderValue(double speedFactor)
210210
int sliderValue = 0;
211211
if (speedFactor > 1.0)
212212
{
213-
sliderValue = (speedFactor - 1.0) * 100;
213+
sliderValue = (long long)(speedFactor * 100) - 100;
214214
}
215215
else if (speedFactor < 1.0)
216216
{
217-
sliderValue = (speedFactor - 1.0) * 1000000;
217+
sliderValue = (long long)(speedFactor * 1000000) - 1000000;
218218
}
219219
else
220220
{
221221
sliderValue = 0;
222222
}
223+
qDebug() << sliderValue;
223224

224225
return sliderValue;
225226
}

‎mainwindow.ui‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</rect>
1212
</property>
1313
<property name="sizePolicy">
14-
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
14+
<sizepolicy hsizetype="Maximum" vsizetype="Maximum">
1515
<horstretch>0</horstretch>
1616
<verstretch>0</verstretch>
1717
</sizepolicy>
@@ -24,8 +24,8 @@
2424
</property>
2525
<property name="maximumSize">
2626
<size>
27-
<width>1024</width>
28-
<height>768</height>
27+
<width>16777215</width>
28+
<height>16777215</height>
2929
</size>
3030
</property>
3131
<property name="font">
@@ -187,7 +187,7 @@ QSlider::handle:horizontal:pressed {
187187
<enum>QSlider::TicksBothSides</enum>
188188
</property>
189189
<property name="tickInterval">
190-
<number>99000</number>
190+
<number>99900</number>
191191
</property>
192192
</widget>
193193
</item>
@@ -784,7 +784,7 @@ QTreeWidget {
784784
</rect>
785785
</property>
786786
<property name="mouseTracking">
787-
<bool>false</bool>
787+
<bool>true</bool>
788788
</property>
789789
<widget class="QMenu" name="menuAbout">
790790
<property name="tearOffEnabled">

0 commit comments

Comments
 (0)