Merge branch 'development'

Projectview.dnproject

@@ -1,24 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project author="silent" authorOS="Windows 10" createdAt="1649055196620" ideName="DevelNext" ideVersion="16.7.0" ideVersionHash="2017103112" name="Projectview" packageName="app" template="ide\project\templates\DefaultGuiProjectTemplate" updatedAt="1660144224087">
+<project author="silent" authorOS="Windows 10" createdAt="1649055196620" ideName="DevelNext" ideVersion="16.7.0" ideVersionHash="2017103112" name="ProjectView" packageName="app" template="ide\project\templates\DefaultGuiProjectTemplate" updatedAt="1689582750612">
   <tree>
     <expanded>
     <path src=""/>
       <path src="/src"/>
-      <path src="/src/.data"/>
-      <path src="/src/.data/web"/>
+      <path src="/src/app"/>
     </expanded>
   </tree>
   <openedFiles>
-  <file src="Projectview.dnproject"/>
-    <file src="src/app/forms/MainForm.php"/>
-    <file src="src/app/events/MainMenuEvents.php"/>
-    <file src="src/app/Dependency.php"/>
-    <file selected="1" src="src/app/modules/AppModule.php"/>
-    <file src="src/.theme/light.theme.fx.css"/>
-    <file src="src/.theme/nord.theme.fx.css"/>
-    <file src="src/.theme/dark.theme.fx.css"/>
-    <file src="src/.theme/menu-bar.fx.css"/>
-    <file src="src/app/modules/MainModule.php"/>
+  <file src="ProjectView.dnproject"/>
+    <file src="src/app/modules/AppModule.php"/>
+    <file selected="1" src="src/app/forms/MainForm.php"/>
   </openedFiles>
   <files/>
   <behaviours>

src/.data/local/ru.txt

@@ -0,0 +1,37 @@
+ui.update.found.message=Найдена новая версия программы
+ui.update.button.update=Обновить
+
+ui.mainMenu.selectDirectory=Выбрать директорию
+ui.mainMenu.theme=Цветовая схема
+ui.mainMenu.theme.light=Светлая
+ui.mainMenu.theme.dark=Темная
+ui.mainMenu.theme.nord=Nord
+ui.mainMenu.about=О программе
+
+ui.contextMenu.saveAs=Соранить как
+ui.contextMenu.rename=Переименовать
+ui.contextMenu.delete=Удалить
+ui.contextMenu.showInExplorer=Показать в проводнике
+
+ui.directorySwitcher.activeDirectory=Текущая директория
+
+ui.tab.viewCode=Исходный код
+ui.tab.viewView=Внешний вид
+
+ui.sidepanel.fielInfo.title=Инфорация о файле
+ui.sidepanel.fielInfo.createdAt=Дата создания:
+ui.sidepanel.fielInfo.modifiedAt=Дата изменения:
+ui.sidepanel.fielInfo.fileSize=Размер:
+ui.sidepanel.fileSizeFromat.b=б
+ui.sidepanel.fileSizeFromat.kb=кБ
+ui.sidepanel.fileSizeFromat.mb=мБ
+ui.sidepanel.fileSizeFromat.gb=гБ
+
+message.error=Произошла ошибка
+message.browser.error=Произошла ошибка в браузере
+message.deleteFile=Вы уверены что хотите удалить - 
+message.link.openInBrowser=Открыть ссылку в браузере
+
+ui.about.site=Сайт:
+ui.about.author=Автор:
+ui.about.version=Версия:

src/.data/web/light.css

@@ -14,17 +14,17 @@ pre {
 /* desert scheme ported from vim to google prettify */
 pre.prettyprint { display: block; background-color: #fafbfc !important; }
 pre .nocode { background-color: none; color: #000 !important; }
-pre .str { color: #925959 !important; } /* string  - pink */
-pre .kwd { color: #7f7948 !important; font-weight: bold }
-pre .com { color: #87ceeb !important; } /* comment - skyblue */
-pre .typ { color: #249324 !important; } /* type    - lightgreen */
-pre .lit { color: #b03b3b !important; } /* literal - darkred */
-pre .pun { color: #000    !important; } /* punctuation */
-pre .pln { color: #000    !important; } /* plaintext */
-pre .tag { color: #c5ba57 !important; font-weight: bold } /* html/xml tag    - lightyellow */
-pre .atn { color: #9a9344 !important; font-weight: bold } /* attribute name  - khaki */
-pre .atv { color: #925959 !important; } /* attribute value - pink */
-pre .dec { color: #249324 !important; } /* decimal         - lightgreen */
+pre .str { color: #925959 !important; }                     /* string */
+pre .kwd { color: #7f7948 !important; font-weight: bold }   /* keyword class, interface, var, as, ... etc */
+pre .com { color: #87ceeb !important; }                     /* comment */
+pre .typ { color: #249324 !important; }                     /* type | classname */
+pre .lit { color: #b03b3b !important; }                     /* literal */
+pre .pun { color: #000    !important; }                     /* punctuation */
+pre .pln { color: #000    !important; }                     /* const name, method name, function name plaintext */
+pre .tag { color: #c5ba57 !important; font-weight: bold }   /* html/xml tag    - lightyellow */
+pre .atn { color: #9a9344 !important; font-weight: bold }   /* attribute name  - khaki */
+pre .atv { color: #925959 !important; }                     /* attribute value */
+pre .dec { color: #249324 !important; }                     /* decimal */
 
 /* Specify class=linenums on a pre to get line numbering */
 ol.linenums {

src/.system/application.conf

@@ -1,6 +1,6 @@
 # MAIN CONFIGURATION
 
-app.name = Projectview
+app.name = ProjectView
 app.uuid = 4ab0becf-aaef-4eae-80b3-a3fca9643815
 app.version = 1
 

src/.theme/combobox.fx.css

@@ -0,0 +1,49 @@
+.combo-box {
+    -fx-focus-color: transparent;
+    -fx-faint-focus-color: transparent;
+    -fx-background-color: -base-color;
+    -fx-border-color: -border-base-color;
+    -fx-border-width: 0 0 1 0;
+}
+
+.combo-box:showing, .combo-box:showing > .list-cell {
+    -fx-background-color: -second-base-color;
+}
+
+.combo-box:showing .arrow {
+    -fx-shape: 'M195.2 195.2a64 64 0 0 1 90.496 0L512 421.504 738.304 195.2a64 64 0 0 1 90.496 90.496L602.496 512 828.8 738.304a64 64 0 0 1-90.496 90.496L512 602.496 285.696 828.8a64 64 0 0 1-90.496-90.496L421.504 512 195.2 285.696a64 64 0 0 1 0-90.496z';
+
+    -fx-pref-height: 10;
+    -fx-pref-width: 10;
+}
+
+.combo-box .arrow-button {
+    -fx-padding: 0 15 0 10 ;
+}
+
+.combo-box .arrow {
+    -fx-shape: 'M15.621,9.844l-9.65-9.649C5.842,0.064,5.674,0,5.5,0C5.329,0,5.157,0.064,5.027,0.195L5.014,0.207
+        C4.888,0.334,4.817,0.506,4.817,0.682v4.682c0,0.178,0.071,0.348,0.197,0.471l4.481,4.482l-4.481,4.479
+        c-0.126,0.126-0.197,0.294-0.197,0.475v4.68c0,0.18,0.071,0.354,0.197,0.475l0.013,0.01c0.124,0.127,0.294,0.197,0.473,0.197
+        s0.348-0.07,0.474-0.197l9.647-9.646C15.881,10.531,15.881,10.104,15.621,9.844z';
+    -fx-background-color: -icons-color;
+    -fx-padding: 5 3 5 3;
+    -fx-pref-width: 8;
+}
+
+.combo-box .list-cell {
+    -fx-background-color: -base-color;
+    -fx-text-fill: -text-color;
+}
+
+
+.combo-box .list-view {
+    -fx-background-insets: 10;
+    -fx-border-width: 1;
+    -fx-border-color: -border-base-color;
+
+}
+
+.combo-box .list-cell:hover {
+    -fx-background-color: -second-base-color;
+}

src/.theme/dark.theme.fx.css

@@ -6,8 +6,6 @@
     -tab-selected-border-color: skyblue;
     -tree-arrow-color: #f1f1f1;
     -scroll-bar-color: #444;
-}
-
-.DependencyItem .link > .viewport {
-    -fx-background-image: url( '/.data/img/ui/openLinkLight.png');
+    -icons-color: #ccc;
+    -border-base-color: #424242;
 }

src/.theme/font.fx.css

@@ -1,19 +1,19 @@
 @font-face {
-    -fx-font-family: 'Open Sans';
+    font-family: 'Open Sans';
     src: url('/.theme/font/OpenSans-Regular.ttf');
 }
 
 @font-face {
-    -fx-font-family: 'Open Sans Italic';
+    font-family: 'Open Sans Italic';
     src: url('/.theme/font/OpenSans-Italic.ttf');
 }
 
 @font-face {
-    -fx-font-family: 'Open Sans Lighter';
+    font-family: 'Open Sans Lighter';
     src: url('/.theme/font/OpenSans-Light.ttf');
 }
 
 @font-face {
-    -fx-font-family: 'Open Sans Bold';
+    font-family: 'Open Sans Bold';
     src: url('/.theme/font/OpenSans-Bold.ttf');
 }

src/.theme/info-panel.fx.css

@@ -12,30 +12,37 @@
 #infoPanelSwitcher:hover {
     -fx-background-color: -base-color;
     -fx-border-width: 1;
-    -fx-border-color: #0000002F;
+    -fx-border-color: -border-base-color;
 }
 
 /* panel */
 #fileInfo {
     -fx-background-color: -second-base-color;
     -fx-text-fill: -text-color;
-    -fx-border-color: -base-color;
+    -fx-border-color: -border-base-color;
 }
 
 #fileInfo > .panel-title {
     -fx-background-color: -second-base-color;
     -fx-border: 1 1 1 1 !important;
-    -fx-border-color: -base-color;
+    -fx-font-weight: bold;
+    -fx-border-color: -border-base-color;
 }
 
 #fileInfo * {
     -fx-text-fill: -text-color;
 }
 
+#createdAtLabel, #modifiedAtLabel, #fileSizeLabel {
+    -fx-font: 12 "Open Sans";
+    -fx-font-weight: bold;
+    -fx-font-style: italic;
+}
+
 
 .DependencyItem {
     -fx-border-width: 1;
-    -fx-border-color: -second-base-color;
+    -fx-border-color: -border-base-color;
     -fx-text-fill: -text-color;
     -fx-background-color: -base-color;
     -fx-padding: 2;
@@ -49,4 +56,16 @@
 
 .DependencyItem .link:hover > .viewport {
     -fx-background-position: 0 -10;
+}
+
+.DependencyItem:hover {
+    -fx-background-color: -second-base-color;
+}
+
+.DependencyItem .link {
+    -fx-background-color: derive(-icons-color, 40%);
+}
+
+.DependencyItem .link:hover {
+    -fx-background-color: derive(-icons-color, -80%)
 }

src/.theme/light.theme.fx.css

@@ -6,8 +6,6 @@
     -tab-selected-border-color: skyblue;
     -tree-arrow-color: #444;
     -scroll-bar-color: #a4a4a4;
-}
-
-.DependencyItem .link > .viewport {
-    -fx-background-image: url( '/.data/img/ui/openLinkDark.png');
+    -icons-color: #717171;
+    -border-base-color: #e3e5e7;
 }

src/.theme/menu-bar.fx.css

@@ -3,17 +3,18 @@
     -fx-effect: dropshadow(gaussian, rgba(0, 0, 0, 0.3), 5, 0.5, 0.0, 0.0);
 }
 
-.menu-bar .menu .label{
+.menu-bar .menu .label, .label, .x-flat-button{
     -fx-text-fill: -text-color;
 }
 
 .menu-bar .menu:hover {
     -fx-background-color: -second-base-color;
 }
 
-
 .context-menu, .menu-item {
     -fx-background-color: -second-base-color;
+    -fx-padding: 8 5;
+    -fx-font-size: 13;
 }
 
 .menu-bar *.check-box {
@@ -32,12 +33,23 @@
 
 .check-box .box {
     -fx-background-color: -base-color;
-    -fx-border-color: derive(-base-color, -15%);
+    -fx-border-color: -border-base-color;
 
-    -fx-border-radius: 0;
-    -fx-background-radius: 0;
+    -fx-border-radius: 45;
+    -fx-background-radius: 45;
+}
+
+.check-box:selected .box {
+    -fx-padding: 5;
+    -fx-pref-width: 20;
+    -fx-pref-height: 20;
 }
 
 .check-box:selected .mark {
-    -fx-background-color: -text-color;
+    // -fx-shape: "M3.432,6.189 C3.824,5.798 4.455,5.798 4.847,6.189 L6.968,8.31 L13.147,2.131 C13.531,1.747 14.157,1.753 14.548,2.144 L16.67,4.266 C17.06,4.657 17.066,5.284 16.684,5.666 L7.662,14.687 C7.278,15.07 6.651,15.064 6.261,14.673 L1.311,9.723 C0.92,9.333 0.92,8.7 1.311,8.31 L3.432,6.189 Z";
+    -fx-shape: "M58.968,12.734c-2.193-2.423-5.936-2.608-8.359-0.415L24.481,35.975L9.991,22.218c-2.371-2.25-6.117-2.152-8.366,0.218
+        c-2.249,2.37-2.152,6.115,0.218,8.365l18.208,17.283c1.145,1.088,2.609,1.627,4.072,1.627c0.822,0,1.643-0.176,2.406-0.516
+        c0.885-0.232,1.729-0.674,2.455-1.332l29.568-26.771C60.976,18.899,61.161,15.157,58.968,12.734z";
+
+    -fx-background-color: -icons-color;
 }

src/.theme/nord.theme.fx.css

@@ -6,8 +6,6 @@
     -tab-selected-border-color: derive(-second-base-color, 25%);
     -tree-arrow-color: white;
     -scroll-bar-color: derive(-second-base-color, 25%);
-}
-
-.DependencyItem .link > .viewport {
-    -fx-background-image: url( '/.data/img/ui/openLinkLight.png');
+    -icons-color: #ccc;
+    -border-base-color: #313131;
 }

src/.theme/style.fx.css

@@ -6,6 +6,8 @@
 @import "menu-bar.fx.css";
 @import "tree.fx.css";
 @import "context-menu.fx.css";
+@import "combobox.fx.css";
+@import "svg-icons.fx.css";
 
 @import "light.theme.fx.css";
 
@@ -25,4 +27,53 @@
 
 .scroll-pane:focused {
     -fx-background-color: -base-color;
-}
+}
+
+
+
+.about .label {
+    -fx-font-size: 18px;
+    -fx-text-fill: white;
+}
+
+.about .title {
+    -fx-font-size: 26px;
+}
+
+.about .hyperlink {
+    -fx-font-size: 18px;
+}
+
+
+.tooltip {
+    -fx-text-fill: -text-color;
+    -fx-background-color: -base-color;
+}
+
+.file-icon .label {
+    -fx-font-weight: bold;
+    -fx-text-fill: ladder(-second-text-color, white 45%, black 50%) !important;
+}
+
+/*
+.red-color {
+    -fx-background-color: #de1f65;
+}
+
+.blue-color {
+    -fx-background-color: #1f6fde;
+}
+
+.green-color {
+    -fx-background-color: #91d15f;
+}
+
+.small-size {
+    -fx-font-size: 6;
+    -fx-font-weight: normal;
+}
+*/
+
+
+
+