diff --git a/.dn/backup.conf b/.dn/backup.conf index e32a065..19bca8d 100644 --- a/.dn/backup.conf +++ b/.dn/backup.conf @@ -1,4 +1,4 @@ -#Sat Jul 28 11:49:35 MSK 2018 +#Sat Jul 28 17:39:04 MSK 2018 autoOpenTrigger= autoCloseTrigger=1 autoIntervalTriggerTime=240000 diff --git a/.dn/bundles/develnext.bundle.httpclient.HttpClientBundle.conf b/.dn/bundles/develnext.bundle.httpclient.HttpClientBundle.conf index fa71a3f..5834453 100644 --- a/.dn/bundles/develnext.bundle.httpclient.HttpClientBundle.conf +++ b/.dn/bundles/develnext.bundle.httpclient.HttpClientBundle.conf @@ -1,4 +1,4 @@ -#Sat Jul 28 11:49:35 MSK 2018 +#Sat Jul 28 17:39:04 MSK 2018 version=1.0 name=HTTP Client env=all diff --git a/.dn/bundles/develnext.bundle.jurl.jURLBundle.conf b/.dn/bundles/develnext.bundle.jurl.jURLBundle.conf index 2013b54..f1c1245 100644 --- a/.dn/bundles/develnext.bundle.jurl.jURLBundle.conf +++ b/.dn/bundles/develnext.bundle.jurl.jURLBundle.conf @@ -1,4 +1,4 @@ -#Sat Jul 28 11:49:35 MSK 2018 +#Sat Jul 28 17:39:04 MSK 2018 version=2.0.0.13-dev name=jURL env=all diff --git a/.dn/bundles/develnext.bundle.sql.SqliteBundle.conf b/.dn/bundles/develnext.bundle.sql.SqliteBundle.conf index 4623e81..fc4326e 100644 --- a/.dn/bundles/develnext.bundle.sql.SqliteBundle.conf +++ b/.dn/bundles/develnext.bundle.sql.SqliteBundle.conf @@ -1,4 +1,4 @@ -#Sat Jul 28 11:49:35 MSK 2018 +#Sat Jul 28 17:39:04 MSK 2018 version=1.0 name=SQLite env=all diff --git a/.dn/bundles/develnext.bundle.zip.ZipBundle.conf b/.dn/bundles/develnext.bundle.zip.ZipBundle.conf index d776cb5..d93c046 100644 --- a/.dn/bundles/develnext.bundle.zip.ZipBundle.conf +++ b/.dn/bundles/develnext.bundle.zip.ZipBundle.conf @@ -1,4 +1,4 @@ -#Sat Jul 28 11:49:35 MSK 2018 +#Sat Jul 28 17:39:04 MSK 2018 version=1.0 name=ZIP env=all diff --git a/.dn/bundles/ide.bundle.std.JPHPDesktopDebugBundle.conf b/.dn/bundles/ide.bundle.std.JPHPDesktopDebugBundle.conf index 22a0a18..b57153f 100644 --- a/.dn/bundles/ide.bundle.std.JPHPDesktopDebugBundle.conf +++ b/.dn/bundles/ide.bundle.std.JPHPDesktopDebugBundle.conf @@ -1,2 +1,2 @@ -#Sat Jul 28 11:49:35 MSK 2018 +#Sat Jul 28 17:39:04 MSK 2018 env=dev diff --git a/.dn/bundles/ide.bundle.std.UIDesktopBundle.conf b/.dn/bundles/ide.bundle.std.UIDesktopBundle.conf index 9f3eac7..e8ded37 100644 --- a/.dn/bundles/ide.bundle.std.UIDesktopBundle.conf +++ b/.dn/bundles/ide.bundle.std.UIDesktopBundle.conf @@ -1,2 +1,2 @@ -#Sat Jul 28 11:49:35 MSK 2018 +#Sat Jul 28 17:39:04 MSK 2018 env=all diff --git a/.dn/ide/editors/FormEditor/src/app/forms/MainForm.php.conf b/.dn/ide/editors/FormEditor/src/app/forms/MainForm.php.conf index f23bd64..7d2e0f8 100644 --- a/.dn/ide/editors/FormEditor/src/app/forms/MainForm.php.conf +++ b/.dn/ide/editors/FormEditor/src/app/forms/MainForm.php.conf @@ -1,4 +1,4 @@ -#Fri Jul 27 18:50:52 MSK 2018 +#Sat Jul 28 17:39:06 MSK 2018 snapType=DOTS blockedNodes= zoom=100 diff --git a/.dn/ide/editors/FormEditor/src/app/forms/SplashScreen.php.conf b/.dn/ide/editors/FormEditor/src/app/forms/SplashScreen.php.conf index 625d2dd..fa7a25e 100644 --- a/.dn/ide/editors/FormEditor/src/app/forms/SplashScreen.php.conf +++ b/.dn/ide/editors/FormEditor/src/app/forms/SplashScreen.php.conf @@ -1,4 +1,4 @@ -#Fri Jul 27 18:50:53 MSK 2018 +#Sat Jul 28 17:39:07 MSK 2018 snapType=DOTS blockedNodes= snapSizeY=8 diff --git a/.dn/ide/editors/FormEditor/src/app/forms/auth.php.conf b/.dn/ide/editors/FormEditor/src/app/forms/auth.php.conf index 0712d25..6e5ebd5 100644 --- a/.dn/ide/editors/FormEditor/src/app/forms/auth.php.conf +++ b/.dn/ide/editors/FormEditor/src/app/forms/auth.php.conf @@ -1,4 +1,4 @@ -#Fri Jul 27 18:50:52 MSK 2018 +#Sat Jul 28 17:39:06 MSK 2018 snapType=DOTS blockedNodes= snapSizeY=8 diff --git a/.dn/ide/editors/FormEditor/src/app/forms/autoAuth.php.conf b/.dn/ide/editors/FormEditor/src/app/forms/autoAuth.php.conf index 625d2dd..fa7a25e 100644 --- a/.dn/ide/editors/FormEditor/src/app/forms/autoAuth.php.conf +++ b/.dn/ide/editors/FormEditor/src/app/forms/autoAuth.php.conf @@ -1,4 +1,4 @@ -#Fri Jul 27 18:50:53 MSK 2018 +#Sat Jul 28 17:39:07 MSK 2018 snapType=DOTS blockedNodes= snapSizeY=8 diff --git a/.dn/ide/editors/FormEditor/src/app/forms/history.php.conf b/.dn/ide/editors/FormEditor/src/app/forms/history.php.conf index 851431d..20e56c2 100644 --- a/.dn/ide/editors/FormEditor/src/app/forms/history.php.conf +++ b/.dn/ide/editors/FormEditor/src/app/forms/history.php.conf @@ -1,4 +1,4 @@ -#Fri Jul 27 18:50:50 MSK 2018 +#Sat Jul 28 17:39:04 MSK 2018 snapType=DOTS blockedNodes= zoom=100 diff --git a/.dn/ide/editors/FormEditor/src/app/forms/loader.php.conf b/.dn/ide/editors/FormEditor/src/app/forms/loader.php.conf index b484ab3..9bc3c31 100644 --- a/.dn/ide/editors/FormEditor/src/app/forms/loader.php.conf +++ b/.dn/ide/editors/FormEditor/src/app/forms/loader.php.conf @@ -1,4 +1,4 @@ -#Fri Jul 27 18:50:51 MSK 2018 +#Sat Jul 28 17:39:05 MSK 2018 snapType=DOTS blockedNodes= snapSizeY=8 diff --git a/.dn/ide/editors/FormEditor/src/app/forms/mainMenu.php.conf b/.dn/ide/editors/FormEditor/src/app/forms/mainMenu.php.conf index f23bd64..7d2e0f8 100644 --- a/.dn/ide/editors/FormEditor/src/app/forms/mainMenu.php.conf +++ b/.dn/ide/editors/FormEditor/src/app/forms/mainMenu.php.conf @@ -1,4 +1,4 @@ -#Fri Jul 27 18:50:52 MSK 2018 +#Sat Jul 28 17:39:06 MSK 2018 snapType=DOTS blockedNodes= zoom=100 diff --git a/.dn/ide/editors/FormEditor/src/app/forms/settings.php.conf b/.dn/ide/editors/FormEditor/src/app/forms/settings.php.conf index b484ab3..9bc3c31 100644 --- a/.dn/ide/editors/FormEditor/src/app/forms/settings.php.conf +++ b/.dn/ide/editors/FormEditor/src/app/forms/settings.php.conf @@ -1,4 +1,4 @@ -#Fri Jul 27 18:50:51 MSK 2018 +#Sat Jul 28 17:39:05 MSK 2018 snapType=DOTS blockedNodes= snapSizeY=8 diff --git a/.dn/ide/editors/FormEditor/src/app/forms/statsProgressDIalog.php.conf b/.dn/ide/editors/FormEditor/src/app/forms/statsProgressDIalog.php.conf index 06c537c..bd32599 100644 --- a/.dn/ide/editors/FormEditor/src/app/forms/statsProgressDIalog.php.conf +++ b/.dn/ide/editors/FormEditor/src/app/forms/statsProgressDIalog.php.conf @@ -1,4 +1,4 @@ -#Fri Jul 27 20:04:05 MSK 2018 +#Sat Jul 28 17:39:08 MSK 2018 snapType=DOTS blockedNodes= zoom=100 diff --git a/.dn/ide/editors/FormEditor/src/app/forms/update.php.conf b/.dn/ide/editors/FormEditor/src/app/forms/update.php.conf index b6b0304..c006454 100644 --- a/.dn/ide/editors/FormEditor/src/app/forms/update.php.conf +++ b/.dn/ide/editors/FormEditor/src/app/forms/update.php.conf @@ -1,4 +1,4 @@ -#Fri Jul 27 18:50:51 MSK 2018 +#Sat Jul 28 17:39:05 MSK 2018 snapType=DOTS blockedNodes= zoom=100 diff --git a/.dn/ide/editors/FormEditor/src/app/forms/userStats.php.conf b/.dn/ide/editors/FormEditor/src/app/forms/userStats.php.conf index ed227f5..a17c489 100644 --- a/.dn/ide/editors/FormEditor/src/app/forms/userStats.php.conf +++ b/.dn/ide/editors/FormEditor/src/app/forms/userStats.php.conf @@ -1,4 +1,4 @@ -#Fri Jul 27 18:50:53 MSK 2018 +#Sat Jul 28 17:39:07 MSK 2018 snapType=DOTS blockedNodes= zoom=100 diff --git a/.dn/ide/editors/FormEditor/src/app/forms/validate.php.conf b/.dn/ide/editors/FormEditor/src/app/forms/validate.php.conf index 625d2dd..fa7a25e 100644 --- a/.dn/ide/editors/FormEditor/src/app/forms/validate.php.conf +++ b/.dn/ide/editors/FormEditor/src/app/forms/validate.php.conf @@ -1,4 +1,4 @@ -#Fri Jul 27 18:50:53 MSK 2018 +#Sat Jul 28 17:39:07 MSK 2018 snapType=DOTS blockedNodes= snapSizeY=8 diff --git a/.dn/ide/editors/ScriptModuleEditor/src/app/modules/AppModule.php.conf b/.dn/ide/editors/ScriptModuleEditor/src/app/modules/AppModule.php.conf index 3745580..902a889 100644 --- a/.dn/ide/editors/ScriptModuleEditor/src/app/modules/AppModule.php.conf +++ b/.dn/ide/editors/ScriptModuleEditor/src/app/modules/AppModule.php.conf @@ -1,2 +1,2 @@ -#Sat Jul 28 11:49:35 MSK 2018 +#Sat Jul 28 17:39:05 MSK 2018 blockedNodes= diff --git a/.dn/ide/editors/ScriptModuleEditor/src/app/modules/MainModule.php.conf b/.dn/ide/editors/ScriptModuleEditor/src/app/modules/MainModule.php.conf index 3745580..173c59a 100644 --- a/.dn/ide/editors/ScriptModuleEditor/src/app/modules/MainModule.php.conf +++ b/.dn/ide/editors/ScriptModuleEditor/src/app/modules/MainModule.php.conf @@ -1,2 +1,2 @@ -#Sat Jul 28 11:49:35 MSK 2018 +#Sat Jul 28 17:39:04 MSK 2018 blockedNodes= diff --git a/.dn/ide/project/behaviours/BundleProjectBehaviour.conf b/.dn/ide/project/behaviours/BundleProjectBehaviour.conf index 2909cb5..1e96999 100644 --- a/.dn/ide/project/behaviours/BundleProjectBehaviour.conf +++ b/.dn/ide/project/behaviours/BundleProjectBehaviour.conf @@ -1,2 +1,2 @@ -#Sat Jul 28 11:49:35 MSK 2018 +#Sat Jul 28 17:39:04 MSK 2018 useImports= diff --git a/.dn/ide/project/behaviours/PhpProjectBehaviour.conf b/.dn/ide/project/behaviours/PhpProjectBehaviour.conf index b91033d..a25ba77 100644 --- a/.dn/ide/project/behaviours/PhpProjectBehaviour.conf +++ b/.dn/ide/project/behaviours/PhpProjectBehaviour.conf @@ -1,3 +1,3 @@ -#Sat Jul 28 11:49:35 MSK 2018 +#Sat Jul 28 17:39:04 MSK 2018 compileByteCode=1 importType=package diff --git a/.dn/library.conf b/.dn/library.conf index d04168c..9f4945e 100644 --- a/.dn/library.conf +++ b/.dn/library.conf @@ -1 +1 @@ -#Sat Jul 28 11:49:35 MSK 2018 +#Sat Jul 28 17:39:04 MSK 2018 diff --git a/FlowerVK.dnproject b/FlowerVK.dnproject index e7e0cea..30179f0 100644 --- a/FlowerVK.dnproject +++ b/FlowerVK.dnproject @@ -1,5 +1,5 @@ - + @@ -12,7 +12,7 @@ - + @@ -27,7 +27,7 @@ - + diff --git a/src/app/forms/MainForm.conf b/src/app/forms/MainForm.conf index 233dd5e..f0bd8e2 100644 --- a/src/app/forms/MainForm.conf +++ b/src/app/forms/MainForm.conf @@ -1,9 +1,9 @@ -#Fri Jul 27 18:50:52 MSK 2018 +#Sat Jul 28 17:39:06 MSK 2018 form.style=TRANSPARENT modules= -form.title=FlowerVK form.backgroundColor= +form.title=FlowerVK form.maximized= -title=MainForm form.modality=1 +title=MainForm form.icon=.data/img/fullIcon.png diff --git a/src/app/forms/MainForm.fxml b/src/app/forms/MainForm.fxml index 9c4bb74..27a891b 100644 --- a/src/app/forms/MainForm.fxml +++ b/src/app/forms/MainForm.fxml @@ -31,13 +31,13 @@ - + - + - + diff --git a/src/app/forms/auth.conf b/src/app/forms/auth.conf index e1cd271..7e431a5 100644 --- a/src/app/forms/auth.conf +++ b/src/app/forms/auth.conf @@ -1,4 +1,4 @@ -#Fri Jul 27 18:50:52 MSK 2018 +#Sat Jul 28 17:39:06 MSK 2018 form.style=DECORATED -form.title=auth form.backgroundColor=\#ffffff +form.title=auth diff --git a/src/app/forms/auth.fxml b/src/app/forms/auth.fxml index 35ba0a5..f6c4213 100644 --- a/src/app/forms/auth.fxml +++ b/src/app/forms/auth.fxml @@ -37,7 +37,7 @@ - + @@ -60,7 +60,7 @@ @@ -68,7 +68,7 @@ - + @@ -77,7 +77,7 @@ - + @@ -91,15 +91,15 @@ - + - + - + - + @@ -108,7 +108,7 @@ - + diff --git a/src/app/forms/autoAuth.conf b/src/app/forms/autoAuth.conf index 0c12a86..8fd44a8 100644 --- a/src/app/forms/autoAuth.conf +++ b/src/app/forms/autoAuth.conf @@ -1,4 +1,4 @@ -#Fri Jul 27 18:50:53 MSK 2018 +#Sat Jul 28 17:39:07 MSK 2018 form.style=TRANSPARENT -form.backgroundColor=\#ffffff form.title=hui +form.backgroundColor=\#ffffff diff --git a/src/app/forms/history.conf b/src/app/forms/history.conf index 0a6b853..5b9a1a9 100644 --- a/src/app/forms/history.conf +++ b/src/app/forms/history.conf @@ -1,4 +1,4 @@ -#Fri Jul 27 18:50:50 MSK 2018 +#Sat Jul 28 17:39:04 MSK 2018 form.style=DECORATED -form.backgroundColor=\#ffffff form.title=history +form.backgroundColor=\#ffffff diff --git a/src/app/forms/history.fxml b/src/app/forms/history.fxml index 04b79c3..23171d8 100644 --- a/src/app/forms/history.fxml +++ b/src/app/forms/history.fxml @@ -24,9 +24,9 @@ - + - + @@ -42,23 +42,23 @@ - - - + diff --git a/src/app/forms/loader.conf b/src/app/forms/loader.conf index e2fa17d..a09ebc5 100644 --- a/src/app/forms/loader.conf +++ b/src/app/forms/loader.conf @@ -1,6 +1,6 @@ -#Fri Jul 27 18:50:51 MSK 2018 +#Sat Jul 28 17:39:05 MSK 2018 form.style=TRANSPARENT -form.backgroundColor=\#ffffff form.title=FlowerVK -form.icon=.data/img/fullIcon.png +form.backgroundColor=\#ffffff form.alwaysOnTop= +form.icon=.data/img/fullIcon.png diff --git a/src/app/forms/mainMenu.conf b/src/app/forms/mainMenu.conf index 6ce5874..c45831c 100644 --- a/src/app/forms/mainMenu.conf +++ b/src/app/forms/mainMenu.conf @@ -1,4 +1,4 @@ -#Fri Jul 27 18:50:52 MSK 2018 +#Sat Jul 28 17:39:06 MSK 2018 form.style=DECORATED -form.backgroundColor=\#ffffff form.title=mainMenu +form.backgroundColor=\#ffffff diff --git a/src/app/forms/mainMenu.fxml b/src/app/forms/mainMenu.fxml index 463bff4..dce456c 100644 --- a/src/app/forms/mainMenu.fxml +++ b/src/app/forms/mainMenu.fxml @@ -18,15 +18,15 @@ - + - + - + - + @@ -34,9 +34,9 @@ - + - + @@ -45,7 +45,7 @@ - + @@ -90,7 +90,7 @@ - + diff --git a/src/app/forms/settings.conf b/src/app/forms/settings.conf index c45cfd8..e5f371e 100644 --- a/src/app/forms/settings.conf +++ b/src/app/forms/settings.conf @@ -1,4 +1,4 @@ -#Fri Jul 27 18:50:51 MSK 2018 +#Sat Jul 28 17:39:05 MSK 2018 form.style=DECORATED -form.backgroundColor=\#ffffff form.title=settings +form.backgroundColor=\#ffffff diff --git a/src/app/forms/settings.fxml b/src/app/forms/settings.fxml index 6e062b6..1fb3336 100644 --- a/src/app/forms/settings.fxml +++ b/src/app/forms/settings.fxml @@ -11,9 +11,9 @@ - + - + @@ -33,179 +33,179 @@ - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -216,19 +216,19 @@ - + - + - + - + @@ -236,19 +236,19 @@ - + - + - + - + diff --git a/src/app/forms/splashscreen.conf b/src/app/forms/splashscreen.conf index e2e25dd..62667aa 100644 --- a/src/app/forms/splashscreen.conf +++ b/src/app/forms/splashscreen.conf @@ -1,6 +1,6 @@ -#Fri Jul 27 18:50:53 MSK 2018 +#Sat Jul 28 17:39:07 MSK 2018 form.style=TRANSPARENT -form.backgroundColor=\#ffffff form.title=FlowerVK -form.icon=.data/img/fullIcon.png +form.backgroundColor=\#ffffff form.alwaysOnTop= +form.icon=.data/img/fullIcon.png diff --git a/src/app/forms/statsProgressDialog.conf b/src/app/forms/statsProgressDialog.conf index 1840059..b7429c1 100644 --- a/src/app/forms/statsProgressDialog.conf +++ b/src/app/forms/statsProgressDialog.conf @@ -1,4 +1,4 @@ -#Fri Jul 27 19:08:39 MSK 2018 +#Sat Jul 28 17:39:08 MSK 2018 form.style=TRANSPARENT -form.title=hui form.backgroundColor=\#ffffff +form.title=hui diff --git a/src/app/forms/statsProgressDialog.fxml b/src/app/forms/statsProgressDialog.fxml index 175cf70..78121cc 100644 --- a/src/app/forms/statsProgressDialog.fxml +++ b/src/app/forms/statsProgressDialog.fxml @@ -13,7 +13,7 @@ - + @@ -57,9 +57,9 @@ - + - + diff --git a/src/app/forms/update.conf b/src/app/forms/update.conf index 07bbd8d..322ac87 100644 --- a/src/app/forms/update.conf +++ b/src/app/forms/update.conf @@ -1,4 +1,4 @@ -#Fri Jul 27 18:50:51 MSK 2018 +#Sat Jul 28 17:39:05 MSK 2018 form.style=DECORATED -form.title=update form.backgroundColor=\#ffffff +form.title=update diff --git a/src/app/forms/update.fxml b/src/app/forms/update.fxml index 24496d6..3de50e3 100644 --- a/src/app/forms/update.fxml +++ b/src/app/forms/update.fxml @@ -14,13 +14,13 @@ - + - + diff --git a/src/app/forms/userStats.conf b/src/app/forms/userStats.conf index cf4cba4..e1ee6bd 100644 --- a/src/app/forms/userStats.conf +++ b/src/app/forms/userStats.conf @@ -1,4 +1,4 @@ -#Fri Jul 27 18:50:53 MSK 2018 +#Sat Jul 28 17:39:07 MSK 2018 form.style=TRANSPARENT -form.title=hui form.backgroundColor=\#ffffff +form.title=hui diff --git a/src/app/forms/validate.conf b/src/app/forms/validate.conf index 93b9495..ccb10c5 100644 --- a/src/app/forms/validate.conf +++ b/src/app/forms/validate.conf @@ -1,4 +1,4 @@ -#Fri Jul 27 18:50:53 MSK 2018 +#Sat Jul 28 17:39:07 MSK 2018 form.style=DECORATED -form.title=validate form.backgroundColor=\#ffffff +form.title=validate diff --git a/src/app/forms/validate.fxml b/src/app/forms/validate.fxml index c9d52b1..b8e8151 100644 --- a/src/app/forms/validate.fxml +++ b/src/app/forms/validate.fxml @@ -13,21 +13,21 @@ - + - + - + - + - + - + @@ -47,15 +47,15 @@ - - @@ -65,21 +65,21 @@ - + - + - + - + - + - + diff --git a/src/app/modules/Updater.php b/src/app/modules/Updater.php index 1ae83c3..b042a13 100644 --- a/src/app/modules/Updater.php +++ b/src/app/modules/Updater.php @@ -11,7 +11,7 @@ class Updater private $mainModule; public $ver = 1.4; - public $build = 6; + public $build = 7; function __construct($mainModule){ $this->mainModule = $mainModule;