Skip to content

Commit

Permalink
- more useful UI.
Browse files Browse the repository at this point in the history
  • Loading branch information
hangum committed Nov 7, 2015
1 parent 94a57b4 commit e0c6eb1
Show file tree
Hide file tree
Showing 10 changed files with 21 additions and 12 deletions.
4 changes: 2 additions & 2 deletions com.hangum.tadpole.ace.editor.core/ace-builds/tadpole-editor.html
View file
Expand Up @@ -75,8 +75,8 @@
<script src="src-min-noconflict/mode-pgsql.js"></script>
<script src="src-min-noconflict/mode-sqlite.js"></script>
<script src="src-min-noconflict/mode-sqlserver.js"></script>
<script src="tdb-ext-min.js" charset="utf-8"></script>
<!-- <script src="tdb-ext.js" charset="utf-8"></script> -->
<script src="tdb-ext-min.js" charset="utf-8"></script>
<!-- <script src="tdb-ext.js" charset="utf-8"></script> -->
</body>

</html>
2 changes: 1 addition & 1 deletion ....tadpole.applicaion.start/bin/com/hangum/tadpole/application/start/messages_ko.properties
View file
Expand Up @@ -125,7 +125,7 @@ LoginDialog_23 = \n\u0009\uB85C\uADF8\uC778 \uC544\uC774\uD53C\uB294

LoginDialog_26 = \n\u0009\uB85C\uADF8\uC778 \uC544\uC774\uD53C\uB294

LoginDialog_27 = \uC2DC\uC2A4\uD15C \uC5B4\uB4DC\uBBFC\uC758 \uD655\uC778\uC774 \uD544\uC694\uD569\uB2C8\uB2E4. \uC5B4\uB4DC\uBBFC\uC5D0\uAC8C \uC5F0\uB77D\uD558\uC5EC \uC8FC\uC2ED\uC2DC\uC624.
LoginDialog_27 = \uC2DC\uC2A4\uD15C \uC5B4\uB4DC\uBBFC\uC758 \uD655\uC778\uC774 \uD544\uC694\uD569\uB2C8\uB2E4. \n\uC5B4\uB4DC\uBBFC\uC758 \uD5C8\uB77D\uC744 \uAE30\uB2E4\uB9AC\uC2ED\uC2DC\uC624.

LoginDialog_28 = \uC5B4\uB4DC\uBBFC\uC774 \uD5C8\uB77D\uD55C IP\uB300\uC5ED\uC744 \uBC97\uC5B4\uB0AC\uC2B5\uB2C8\uB2E4.\n \uC5B4\uB4DC\uBBFC\uC5D0\uAC8C \uBB38\uC758\uD558\uC5EC \uC8FC\uC2ED\uC2DC\uC624.

Expand Down
2 changes: 1 addition & 1 deletion com.hangum.tadpole.applicaion.start/launcher/tadpole_configuration.launch
View file
Expand Up @@ -16,7 +16,7 @@
<booleanAttribute key="includeOptional" value="true"/>
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ko -consoleLog -console -test -testDB -forceSystemInitialize -defaultDB MySQL -debuglog -passwd heechan.tadpole.owner.son -newUserPermit NO &#13;&#10;-dbServer BZSmKIt+/Mwzm9tZHAgzrHenP+Nm9i0yK/RLZLvJ4v8rJWtjQjmR8Nx0+TE7r8XJtKlFHsbPnxhNiT+D86XWnsXtLGMJWLgb9F5Rrnuxrb2OKirsQM+/sydp2OfNK7d1M1W1zQd3d7OhAtnBmFjwcNd2otVizkgr&#10; -dbPath /Users/hangum/Documents/tadpole/tadpole-system.db"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ko -consoleLog -console -test -testDB -forceSystemInitialize -defaultDB MySQL -debuglog -passwd heechan.tadpole.owner.son &#13;&#10;-db Server BZSmKIt+/Mwzm9tZHAgzrHenP+Nm9i0yK/RLZLvJ4v8rJWtjQjmR8Nx0+TE7r8XJtKlFHsbPnxhNiT+D86XWnsXtLGMJWLgb9F5Rrnuxrb2OKirsQM+/sydp2OfNK7d1M1W1zQd3d7OhAtnBmFjwcNd2otVizkgr&#10; -dbPath /Users/hangum/Documents/tadpole/tadpole-system.db"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Declipse.ignoreApp=true -Dosgi.noShutdown=true&#13;&#10;-Dorg.eclipse.equinox.http.jetty.log.stderr.threshold=info -Xverify:none"/>
<stringAttribute key="org.eclipse.rap.launch.browserMode" value="EXTERNAL"/>
Expand Down
2 changes: 1 addition & 1 deletion ....tadpole.applicaion.start/src/com/hangum/tadpole/application/start/messages_ko.properties
View file
Expand Up @@ -125,7 +125,7 @@ LoginDialog_23 = \n\u0009\uB85C\uADF8\uC778 \uC544\uC774\uD53C\uB294

LoginDialog_26 = \n\u0009\uB85C\uADF8\uC778 \uC544\uC774\uD53C\uB294

LoginDialog_27 = \uC2DC\uC2A4\uD15C \uC5B4\uB4DC\uBBFC\uC758 \uD655\uC778\uC774 \uD544\uC694\uD569\uB2C8\uB2E4. \uC5B4\uB4DC\uBBFC\uC5D0\uAC8C \uC5F0\uB77D\uD558\uC5EC \uC8FC\uC2ED\uC2DC\uC624.
LoginDialog_27 = \uC2DC\uC2A4\uD15C \uC5B4\uB4DC\uBBFC\uC758 \uD655\uC778\uC774 \uD544\uC694\uD569\uB2C8\uB2E4. \n\uC5B4\uB4DC\uBBFC\uC758 \uD5C8\uB77D\uC744 \uAE30\uB2E4\uB9AC\uC2ED\uC2DC\uC624.

LoginDialog_28 = \uC5B4\uB4DC\uBBFC\uC774 \uD5C8\uB77D\uD55C IP\uB300\uC5ED\uC744 \uBC97\uC5B4\uB0AC\uC2B5\uB2C8\uB2E4.\n \uC5B4\uB4DC\uBBFC\uC5D0\uAC8C \uBB38\uC758\uD558\uC5EC \uC8FC\uC2ED\uC2DC\uC624.

Expand Down
2 changes: 0 additions & 2 deletions ...rc/com/hangum/tadpole/application/initialize/wizard/SystemAdminWizardDefaultUserPage.java
View file
Expand Up @@ -184,6 +184,4 @@ public SystemAdminWizardUserDAO getUserData() {

return dao;
}


}
2 changes: 1 addition & 1 deletion ...on/src/com/hangum/tadpole/application/initialize/wizard/SystemAdminWizardUseTypePage.java
View file
Expand Up @@ -80,7 +80,7 @@ public void widgetSelected(SelectionEvent e) {
for(int i=0; i<USER_GROUP.length; i++) {
comboUserGroup.add(USER_GROUP[i], i);
}
comboUserGroup.select(0);
comboUserGroup.select(1);

setControl(container);

Expand Down
2 changes: 1 addition & 1 deletion com.hangum.tadpole.application/src/com/hangum/tadpole/application/messages.properties
View file
Expand Up @@ -82,6 +82,6 @@ SystemAdminWizardUseType_4 = Group

SystemAdminWizardUseType_5 = Use type

SystemAdminWizardUseType_6 = * Select when using personal.\n Press the Finish button, you can use just the Tadpole DB Hub.\n The IP 127.* can be used.\n\n Setting : Preference -> Preference -> User
SystemAdminWizardUseType_6 = * Select when using personal.\n Press the Finish button, you can use just the Tadpole DB Hub.\n The all IP can be used.\n\n Setting : Preference -> Preference -> User

SystemAdminWizardUseType_7 = * Select when using a Tadpole DB Hub with other users.\n Click Next button, you must enter the system admin.
2 changes: 1 addition & 1 deletion com.hangum.tadpole.application/src/com/hangum/tadpole/application/messages_ko.properties
View file
Expand Up @@ -85,6 +85,6 @@ SystemAdminWizardUseType_4 = \uADF8\uB8F9

SystemAdminWizardUseType_5 = \uC0AC\uC6A9 \uD615\uD0DC

SystemAdminWizardUseType_6 = * \uAC1C\uC778 \uD63C\uC790 \uC0AC\uC6A9\uD560 \uB54C \uC120\uD0DD\uD569\uB2C8\uB2E4.\n Finish \uBC84\uD2BC\uC744 \uB204\uB974\uBA74 \uC62C\uCC59\uC774\uB97C \uBC14\uB85C \uC0AC\uC6A9\uD560 \uC218 \uC788\uC2B5\uB2C8\uB2E4.\n 127.*\uB85C \uC2DC\uC791\uD558\uB294 \uC544\uC774\uD53C\uB9CC \uC0AC\uC6A9\uAC00\uB2A5\uD569\uB2C8\uB2E4.\n\n \uC124\uC815 : \uD658\uACBD\uC124\uC815 -> Preference -> \uC0AC\uC6A9\uC790
SystemAdminWizardUseType_6 = * \uAC1C\uC778 \uD63C\uC790 \uC0AC\uC6A9\uD560 \uB54C \uC120\uD0DD\uD569\uB2C8\uB2E4.\n Finish \uBC84\uD2BC\uC744 \uB204\uB974\uBA74 \uC62C\uCC59\uC774\uB97C \uBC14\uB85C \uC0AC\uC6A9\uD560 \uC218 \uC788\uC2B5\uB2C8\uB2E4.\n \uBAA8\uB4E0 \uC544\uC774\uD53C\uC5D0\uC11C \uC811\uC18D\uAC00\uB2A5\uD569\uB2C8\uB2E4.\n\n \uC124\uC815 : \uD658\uACBD\uC124\uC815 -> \uD658\uACBD\uC124\uC815 -> \uC0AC\uC6A9\uC790

SystemAdminWizardUseType_7 = * \uB2E4\uB978 \uC0AC\uC6A9\uC790\uC640 \uD568\uAED8 \uC62C\uCC59\uC774\uB97C \uC0AC\uC6A9 \uD560\uB54C \uC120\uD0DD\uD558\uC2ED\uC2DC\uC624.\n Next \uBC84\uD2BC\uC744 \uB20C\uB7EC \uC2DC\uC2A4\uD15C \uC5B4\uB4DC\uBBFC\uC744 \uC785\uB825\uD574\uC57C\uD569\uB2C8\uB2E4.\n\n -> \uC11C\uBC84 \uC774\uC911\uD654 \uBC0F \uD655\uC7A5\uC744 \uC704\uD574 \uC5D4\uC9C4 \uB514\uBE44\uB97C MySQL, MariaDB\uB97C \uC0AC\uC6A9\uD560 \uC218\uC788\uC2B5\uB2C8\uB2E4.\n (adi.tadpole@gmail.com \uBB38\uC758\uD558\uC5EC \uC8FC\uC2ED\uC2DC\uC624.)
2 changes: 1 addition & 1 deletion com.hangum.tadpole.build.war/WEB-INF/web.xml
View file
Expand Up @@ -20,7 +20,7 @@
the -console parameter to enabled OSGi console access. -->
<init-param>
<param-name>commandline</param-name>
<param-value>-registryMultiLanguage -GAON -forceSystemInitialize -defaultDB MySQL <!-- -nl ko -debuglog -console --></param-value>
<param-value>-registryMultiLanguage -forceSystemInitialize -defaultDB MySQL <!-- -nl ko -debuglog -console --></param-value>
</init-param>

<load-on-startup>1</load-on-startup>
Expand Down
13 changes: 12 additions & 1 deletion ...dpole.rdb.core/src/com/hangum/tadpole/rdb/core/dialog/resource/ResourceHistoryDialog.java
View file
Expand Up @@ -33,6 +33,8 @@
import com.hangum.tadpole.engine.query.dao.system.UserDBResourceDataDAO;
import com.hangum.tadpole.engine.query.sql.TadpoleSystem_UserDBResource;
import com.hangum.tadpole.rdb.core.Messages;
import org.eclipse.jface.viewers.ISelectionChangedListener;
import org.eclipse.jface.viewers.SelectionChangedEvent;

/**
* Resource history dialog
Expand Down Expand Up @@ -127,6 +129,15 @@ protected Control createDialogArea(Composite parent) {
sashForm.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1));

tvHistory = new TableViewer(sashForm, SWT.BORDER | SWT.FULL_SELECTION | SWT.MULTI);
tvHistory.addSelectionChangedListener(new ISelectionChangedListener() {
public void selectionChanged(SelectionChangedEvent event) {
StructuredSelection sss = (StructuredSelection)tvHistory.getSelection();
if(sss.isEmpty()) return;

UserDBResourceDataDAO userDBResource = (UserDBResourceDataDAO)sss.getFirstElement();
textLeft.setText(userDBResource.getDatas());
}
});
Table table = tvHistory.getTable();
table.setLinesVisible(true);
table.setHeaderVisible(true);
Expand All @@ -150,7 +161,7 @@ protected Control createDialogArea(Composite parent) {
tvHistory.setContentProvider(new ArrayContentProvider());
tvHistory.setLabelProvider(new ResourceHistoryLabelProvider());

Composite compositeCompare = new Composite(sashForm, SWT.NONE);
SashForm compositeCompare = new SashForm(sashForm, SWT.NONE);
compositeCompare.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1));
compositeCompare.setLayout(new GridLayout(2, false));

Expand Down

0 comments on commit e0c6eb1

Please sign in to comment.