Permalink
Browse files

UI update details

  • Loading branch information...
1 parent 59e8b21 commit 162832cc26c018ad416b607655fa80d99bf6e87c @beimprovised committed Jun 14, 2016
Showing with 27,915 additions and 24,466 deletions.
  1. +46 −42 bin/resource/pic/attach_switch_to_editor.svg
  2. +8 −8 bin/resource/pic/tableware.svg
  3. +1 −0 bin/resource/standartconfig/any/mode.ini
  4. +70 −4 bin/resource/standartconfig/any/stylesheet.css
  5. BIN doc/binder.dia~
  6. BIN doc/binder_00.dia
  7. BIN doc/binder_00.png
  8. BIN doc/binder_01.dia
  9. BIN doc/binder_01.dia~
  10. BIN doc/binder_01.png
  11. BIN doc/binder_02.dia
  12. BIN doc/binder_02.dia~
  13. BIN doc/up_linker.dia
  14. BIN doc/up_linker.dia~
  15. +1,782 −0 qrc_data.cpp
  16. +153 −0 qrc_htmls.cpp
  17. +1,461 −1,602 src/controllers/record_table/RecordController.cpp
  18. +1 −1 src/controllers/record_table/RecordController.h
  19. +2 −2 src/libraries/ClipboardBranch.cpp
  20. +23 −35 src/libraries/DiskHelper.cpp
  21. +137 −122 src/libraries/FixedParameters.cpp
  22. +90 −13 src/libraries/FixedParameters.h
  23. +57 −60 src/libraries/FlatControl.h
  24. +28 −37 src/libraries/GlobalParameters.cpp
  25. +52 −81 src/libraries/qt_single_application5/qtsingleapplication.cpp
  26. +3 −3 src/libraries/wyedit/Editor.cpp
  27. +62 −26 src/main.cpp
  28. +11 −11 src/models/attach_table/Attach.cpp
  29. +1 −1 src/models/attach_table/AttachTableData.cpp
  30. +699 −866 src/models/record_table/ItemsFlat.cpp
  31. +625 −731 src/models/record_table/Record.cpp
  32. +250 −132 src/models/record_table/Record.h
  33. +511 −622 src/models/record_table/RecordModel.cpp
  34. +95 −96 src/models/record_table/RecordModel.h
  35. +456 −559 src/models/record_table/linker.cxx
  36. +12 −12 src/models/tree/KnowModel.cpp
  37. +1,930 −2,193 src/models/tree/TreeItem.cpp
  38. +380 −301 src/models/tree/TreeItem.h
  39. +409 −513 src/models/tree/TreeModel.cpp
  40. +1 −1 src/models/tree/binder.cxx
  41. +405 −480 src/models/tree/treeindex.cxx
  42. +1,611 −0 src/uncrustify 6.0.cfg
  43. +329 −329 src/uncrustify.cfg
  44. +1,752 −0 src/uncrustify_hugh.cfg
  45. +1,061 −1,369 src/utility/delegate.h
  46. +80 −129 src/views/app_config/AppConfigPageRecordTable.cpp
  47. +7 −7 src/views/app_config/AppConfigPageTable.h
  48. +699 −853 src/views/browser/browser.cpp
  49. +10 −31 src/views/browser/browser.h
  50. +1,162 −1,215 src/views/browser/entrance.cpp
  51. +2 −3 src/views/browser/entrance.h
  52. +1,809 −1,550 src/views/browser/tabwidget.cpp
  53. +473 −362 src/views/browser/tabwidget.h
  54. +2 −2 src/views/browser/toolbarsearch.cpp
  55. +1,435 −1,753 src/views/browser/webview.cpp
  56. +936 −1,064 src/views/find_in_base_screen/FindScreen.cpp
  57. +692 −830 src/views/main_window/MainWindow.cpp
  58. +116 −138 src/views/main_window/MainWindow.h
  59. +93 −4 src/views/main_window/hidabletabwidget.cpp
  60. +4 −1 src/views/main_window/hidabletabwidget.h
  61. +3 −3 src/views/record/InfoFieldEnter.h
  62. +165 −233 src/views/record/MetaEditor.cpp
  63. +822 −876 src/views/record_table/RecordScreen.cpp
  64. +76 −73 src/views/record_table/RecordScreen.h
  65. +680 −487 src/views/record_table/RecordView.cpp
  66. +164 −77 src/views/record_table/RecordView.h
  67. +13 −11 src/views/record_table/verticalscrollarea.cpp
  68. +6 −6 src/views/record_table/verticalscrollarea.h
  69. +1,987 −2,494 src/views/tree/KnowView.cpp
  70. +1,936 −1,992 src/views/tree/TreeScreen.cpp
  71. +22 −20 src/views/tree/TreeScreen.h
  72. +7 −0 virtualbox.repo
@@ -13,8 +13,8 @@
height="16px"
id="svg2385"
sodipodi:version="0.32"
- inkscape:version="0.48.4 r9939"
- sodipodi:docname="attach_edit.svg"
+ inkscape:version="0.91 r13725"
+ sodipodi:docname="attach_switch_to_editor.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape"
version="1.1">
<defs
@@ -44,9 +44,9 @@
gridtolerance="3"
guidetolerance="3"
inkscape:window-width="1366"
- inkscape:window-height="721"
- inkscape:window-x="-4"
- inkscape:window-y="-4"
+ inkscape:window-height="702"
+ inkscape:window-x="0"
+ inkscape:window-y="29"
inkscape:snap-bbox="true"
inkscape:object-paths="false"
inkscape:object-nodes="true"
@@ -66,7 +66,7 @@
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
+ <dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
@@ -82,41 +82,45 @@
x="0"
y="0"
ry="0" />
- <path
- inkscape:connector-curvature="0"
- style="fill:#87aade;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- d="M 7.513472,7.973768"
- id="path3219"
- sodipodi:nodetypes="cc" />
- <path
- inkscape:connector-curvature="0"
- style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.49999997;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- d="m 7.4962975,13.529051 -2.246298,-2.370349 0,-7.901167 4.4925952,1e-6 1e-7,7.901165 -2.2462973,2.37035 z"
- id="path3212"
- sodipodi:nodetypes="cccccc" />
- <path
- inkscape:connector-curvature="0"
- style="fill:#87aade;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.49999997;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- d="m 5.2499995,10.960686 c 1.54877,-0.324414 3.0510084,-0.354223 4.4925922,0 l 2e-7,-9.70315 -4.4925924,10e-7 z"
- id="rect3214"
- sodipodi:nodetypes="ccccc" />
- <path
- inkscape:connector-curvature="0"
- style="fill:#87aade;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- d="M 7.4962973,13.467323 6.4500905,12.410242 c 0.6793333,-0.140356 1.3730289,-0.169574 2.0924136,0 l -1.0462068,1.057081 z"
- id="path3228"
- sodipodi:nodetypes="cccc" />
- <path
- inkscape:connector-curvature="0"
- style="fill:#87aade;fill-opacity:1;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- d="M 8.5224368,10.592945 8.5111038,1.257535"
- id="path3217"
- sodipodi:nodetypes="cc" />
- <path
- inkscape:connector-curvature="0"
- style="fill:#87aade;fill-opacity:1;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- d="m 6.5012101,10.698245 0,-9.533423"
- id="path3238"
- sodipodi:nodetypes="cc" />
+ <g
+ id="g4230"
+ transform="matrix(0.9281016,0.37232703,-0.37232703,0.9281016,3.6595984,-1.4205086)">
+ <path
+ sodipodi:nodetypes="cc"
+ id="path3219"
+ d="M 7.513472,7.973768"
+ style="fill:#87aade;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="cccccc"
+ id="path3212"
+ d="m 7.4962975,13.529051 -2.246298,-2.370349 0,-7.901167 4.4925952,1e-6 1e-7,7.901165 -2.2462973,2.37035 z"
+ style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.49999997;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="ccccc"
+ id="rect3214"
+ d="m 5.2499995,10.960686 c 1.54877,-0.324414 3.0510084,-0.354223 4.4925922,0 l 2e-7,-9.70315 -4.4925924,10e-7 z"
+ style="fill:#87aade;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.49999997;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="cccc"
+ id="path3228"
+ d="M 7.4962973,13.467323 6.4500905,12.410242 c 0.6793333,-0.140356 1.3730289,-0.169574 2.0924136,0 l -1.0462068,1.057081 z"
+ style="fill:#87aade;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="cc"
+ id="path3217"
+ d="M 8.5224368,10.592945 8.5111038,1.257535"
+ style="fill:#87aade;fill-opacity:1;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="cc"
+ id="path3238"
+ d="m 6.5012101,10.698245 0,-9.533423"
+ style="fill:#87aade;fill-opacity:1;stroke:#000000;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ inkscape:connector-curvature="0" />
+ </g>
</g>
</svg>
@@ -25,17 +25,17 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
- inkscape:zoom="27.148324"
- inkscape:cx="3.3749529"
- inkscape:cy="7.2839345"
+ inkscape:zoom="32"
+ inkscape:cx="8"
+ inkscape:cy="8"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
units="px"
- inkscape:window-width="1364"
- inkscape:window-height="684"
+ inkscape:window-width="1366"
+ inkscape:window-height="702"
inkscape:window-x="0"
- inkscape:window-y="27"
+ inkscape:window-y="29"
inkscape:window-maximized="1" />
<metadata
id="metadata3359">
@@ -45,7 +45,7 @@
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
+ <dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
@@ -55,7 +55,7 @@
id="layer1"
transform="translate(0,-1036.3622)">
<g
- transform="matrix(0.05188355,0,0,0.04284335,2.7742513,1037.7557)"
+ transform="matrix(0,0.05188355,-0.04284335,0,14.687667,1039.1562)"
id="layer1-5">
<path
style="fill:#7f7f7f"
@@ -0,0 +1 @@
+application_mode=Portable
@@ -18,12 +18,14 @@ QToolBar, QToolButton, QPushButton
margin: 0px 0px 0px 0px;
background-color: transparent;
}
+
QMenu{
border: 0px;
background: transparent;
margin: 0px 0px 0px 0px;
background-color: transparent;
}
+
QToolButton {
padding: 0px;
}
@@ -38,13 +40,15 @@ QScrollBar:vertical {
border-style: solid;
background-color: transparent; /* background-color: rgb(240, 240, 240);*/
}
+
QScrollBar::handle:vertical {
background: qlineargradient(x1:0, y1:0, x2:1, y2:0,
stop: 0 #666666, stop: 0.5 #666666, stop:1 #666666); /* stop: 0 rgb(32, 47, 130), stop: 0.5 rgb(32, 47, 130), stop:1 rgb(32, 47, 130));*/
min-height: 10px; /* min-height: 25px;*/
background-color: #AEA89A; /* rgb(180, 180, 180) 200,200,200*/
border: 1px #948B77 solid;
}
+
QScrollBar::add-line:vertical {
background: qlineargradient(x1:0, y1:0, x2:1, y2:0,
stop: 0 #999999, stop: 0.5 #999999, stop:1 #999999); /* stop: 0 rgb(32, 47, 130), stop: 0.5 rgb(32, 47, 130), stop:1 rgb(32, 47, 130));*/
@@ -54,6 +58,7 @@ QScrollBar::add-line:vertical {
border: 1px solid grey;
background-color: rgb(241, 241, 241);
}
+
QScrollBar::sub-line:vertical {
background: qlineargradient(x1:0, y1:0, x2:1, y2:0,
stop: 0 #999999, stop: 0.5 #999999, stop:1 #999999); /* stop: 0 rgb(32, 47, 130), stop: 0.5 rgb(32, 47, 130), stop:1 rgb(32, 47, 130));*/
@@ -67,12 +72,15 @@ QScrollBar::sub-line:vertical {
QScrollBar::add-page: vertical, QScrollBar::sub-page: vertical {
background: none;
}
+
QScrollBar::up-arrow: vertical {
- image: url(:/BarIcon/Icons/uparrow.png);
+ image: url(:/resource/pic/mobile_up.svg);/* :/BarIcon/Icons/uparrow.png */
}
+
QScrollBar::down-arrow: vertical {
- image: url(:/BarIcon/Icons/downarrow.png);
+ image: url(:/resource/pic/mobile_down.svg);/* :/BarIcon/Icons/downarrow.png */
}
+
QScrollBar::handle: hover {
background-color: rgb(100, 100, 100);
width:10px;
@@ -88,13 +96,15 @@ QScrollBar:horizontal {
border-style: solid;
background-color: transparent; /* background-color: rgb(240, 240, 240); */
}
+
QScrollBar::handle:horizontal {
background: qlineargradient(x1:0, y1:0, x2:0, y2:1,
stop: 0 #666666, stop: 0.5 #666666, stop:1 #666666); /* stop: 0 rgb(32, 47, 130), stop: 0.5 rgb(32, 47, 130), stop:1 rgb(32, 47, 130));*/
min-width: 10px; /* min-width: 25px; */
background-color: #AEA89A; /* rgb(180, 180, 180) 200,200,200*/
border: 1px #948B77 solid;
}
+
QScrollBar::add-line:horizontal {
background: qlineargradient(x1:0, y1:0, x2:0, y2:1,
stop: 0 #999999, stop: 0.5 #999999, stop:1 #999999); /* stop: 0 rgb(32, 47, 130), stop: 0.5 rgb(32, 47, 130), stop:1 rgb(32, 47, 130));*/
@@ -104,6 +114,7 @@ QScrollBar::add-line:horizontal {
border: 1px solid grey;
background-color: rgb(241, 241, 241);
}
+
QScrollBar::sub-line:horizontal {
background: qlineargradient(x1:0, y1:0, x2:0, y2:1,
stop: 0 #999999, stop: 0.5 #999999, stop:1 #999999); /* stop: 0 rgb(32, 47, 130), stop: 0.5 rgb(32, 47, 130), stop:1 rgb(32, 47, 130));*/
@@ -113,18 +124,73 @@ QScrollBar::sub-line:horizontal {
border: 1px solid grey;
background-color: rgb(241, 241, 241);
}
+
QScrollBar::left-arrow: horizontal
{
- image: url(:/BarIcon/Icons/leftarrow.png);
+ image: url(:/resource/pic/mobile_back.svg); /* :/BarIcon/Icons/leftarrow.png */
}
+
QScrollBar::right-arrow: horizontal
{
- image: url(:/BarIcon/Icons/rightarrow.png);
+ image: url(:/resource/pic/mobile_forward.svg); /* :/BarIcon/Icons/rightarrow.png */
}
+
QScrollBar::add-page: horizontal, QScrollBar::sub-page: horizontal {
background: none;
}
+
QScrollBar::handle: hover {
background-color: rgb(100, 100, 100);
height:10px;
}
+
+
+browser--QTabWidget::pane {
+ border: 0 px;
+}
+
+
+browser--QTabBar::tab {
+ /*left 3 px;*/
+ /*alignment: bottom;*/
+ height: 10px;
+ width: 16 px;
+ max-width: 16px;
+ /* qproperty-alignment: AlignBottom; AlignCenter | AlignVCenter;*/
+ qproperty-wordWrap: false;
+ padding-bottom: 0px;
+ padding: 0 px;
+ margin-left: 2 px;
+ margin-right: 0 px;
+} /* margin: 0 px;*/
+
+browser--QTabWidget::tab-bar {
+ /*alignment: bottom;*/
+ height: 10px;
+ width: 10px;
+ max-width: 10 px;
+ text-align: left;
+ /*qproperty-alignment: AlignBottom;*/
+ qproperty-wordWrap: false;
+ padding-bottom: 0px;
+ margin-left: 2 px;
+ padding: 0 px;
+ margin-right: 0 px;
+} /* margin: 0 px;*/
+
+/*
+QTabBar::tab {
+ max-width: 200px;
+ padding: 0 px;
+ margin-left: 2 px;
+ margin-right: 0 px;
+}
+QTabWidget::tab-bar {
+ max-width: 200px;
+ align: left;
+ text-align: left;
+ margin-left: 2 px;
+ padding: 0 px;
+ margin-right: 0 px;
+}
+*/
View
Binary file not shown.
View
Binary file not shown.
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
Binary file not shown.
View
Binary file not shown.
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
Oops, something went wrong.

0 comments on commit 162832c

Please sign in to comment.