Your ROOT_URL in app.ini is http://git.osmesh.ru/ but you are visiting http://91.221.70.94:3000/MOS/OpenBoard/commit/42b08ef39a3669f53fb5a175c726bf2a3f66ecf3?style=split&whitespace=ignore-eol You should set ROOT_URL correctly, otherwise the web may not work correctly.

Revert "added possibility to start in Document Mode"

This reverts commit 62a5ad33bd.
preferencesAboutTextFull
Clément Fauconnier 6 years ago
parent e4e23c7f4e
commit 42b08ef39a
  1. 5
      resources/forms/preferences.ui
  2. 8
      src/core/UBApplication.cpp

@ -387,11 +387,6 @@
<string>Desktop</string> <string>Desktop</string>
</property> </property>
</item> </item>
<item>
<property name="text">
<string>Document</string>
</property>
</item>
</widget> </widget>
</item> </item>
<item row="0" column="2"> <item row="0" column="2">

@ -351,12 +351,10 @@ int UBApplication::exec(const QString& pFileToImport)
if (pFileToImport.length() > 0) if (pFileToImport.length() > 0)
UBApplication::applicationController->importFile(pFileToImport); UBApplication::applicationController->importFile(pFileToImport);
if (UBSettings::settings()->appStartMode->get().toInt() == 0) if (UBSettings::settings()->appStartMode->get().toInt())
applicationController->showBoard();
else if (UBSettings::settings()->appStartMode->get().toInt() == 1)
applicationController->showDesktop(); applicationController->showDesktop();
else if (UBSettings::settings()->appStartMode->get().toInt() == 2) else
applicationController->showDocument(); applicationController->showBoard();
emit UBDrawingController::drawingController()->colorPaletteChanged(); emit UBDrawingController::drawingController()->colorPaletteChanged();

Loading…
Cancel
Save