Skip to content

Linux OSのgtk3 packageが存在した場合の対応 #72

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Sankakumaru wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Linux OSのgtk3 packageが存在した場合の対応 #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions main/logbook/data/context/GlobalContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,22 @@ public final class GlobalContext {
INIT_COMPLETE = true;
}

// Linux において gtk3 packageの有無により動作を変えるための設定。
// OSの環境変数 GTK3PKG は logbook.sh 起動前に手動で設定しておくこと。
// gtk3 packageが存在する場合の設定例. # export GTK3PKG=true
public static final boolean GTK3;
static {
String VAR_NAME = System.getenv("GTK3PKG");
if (VAR_NAME.equals("true"))
{
GTK3 = true;
}
else
{
GTK3 = false;
}
}

private static enum MATERIAL_DIFF {
NEW_VALUE, OBTAINED, CONSUMED, NONE;
}
Expand Down
20 changes: 18 additions & 2 deletions main/logbook/gui/CalcExpDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,15 @@ private void createContents() {
label1.setText("今のレベル");
this.beforelv = new Spinner(plan, SWT.BORDER);
GridData gdBeforelv = new GridData(SWT.LEFT, SWT.CENTER, false, false, 1, 1);
gdBeforelv.widthHint = SwtUtils.DPIAwareWidth(45);
if (logbook.data.context.GlobalContext.GTK3)
{
gdBeforelv.widthHint = SwtUtils.DPIAwareWidth(110);
gdBeforelv.heightHint = SwtUtils.DPIAwareHeight(36);
}
else
{
gdBeforelv.widthHint = SwtUtils.DPIAwareWidth(45);
}
this.beforelv.setLayoutData(gdBeforelv);
this.beforelv.setMaximum(ExpTable.MAX_LEVEL);
this.beforelv.setMinimum(1);
Expand All @@ -149,7 +157,15 @@ private void createContents() {
label4.setText("目標レベル");
this.afterlv = new Spinner(plan, SWT.BORDER);
GridData gdAfterlv = new GridData(SWT.LEFT, SWT.CENTER, false, false, 1, 1);
gdAfterlv.widthHint = SwtUtils.DPIAwareWidth(45);
if (logbook.data.context.GlobalContext.GTK3)
{
gdAfterlv.widthHint = SwtUtils.DPIAwareWidth(110);
gdAfterlv.heightHint = SwtUtils.DPIAwareHeight(36);
}
else
{
gdAfterlv.widthHint = SwtUtils.DPIAwareWidth(45);
}
this.afterlv.setLayoutData(gdAfterlv);
this.afterlv.setMaximum(ExpTable.MAX_LEVEL);
this.afterlv.setMinimum(1);
Expand Down
20 changes: 18 additions & 2 deletions main/logbook/gui/CalcPracticeExpDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,15 @@ private void createContents() {
this.shipNameLabels[0].setLayoutData(gdFirstShipName);
this.firstShipLevel = new Spinner(practiceinfo, SWT.BORDER);
GridData gdFirstShipLevel = new GridData(SWT.LEFT, SWT.CENTER, false, false, 1, 1);
gdFirstShipLevel.widthHint = SwtUtils.DPIAwareWidth(45);
if (logbook.data.context.GlobalContext.GTK3)
{
gdFirstShipLevel.widthHint = SwtUtils.DPIAwareWidth(110);
gdFirstShipLevel.heightHint = SwtUtils.DPIAwareHeight(36);
}
else
{
gdFirstShipLevel.widthHint = SwtUtils.DPIAwareWidth(45);
}
this.firstShipLevel.setLayoutData(gdFirstShipLevel);
this.firstShipLevel.setMaximum(ExpTable.MAX_LEVEL);
this.firstShipLevel.setMinimum(1);
Expand All @@ -115,7 +123,15 @@ private void createContents() {
this.shipNameLabels[1].setLayoutData(gdSecondShipName);
this.secondShipLevel = new Spinner(practiceinfo, SWT.BORDER);
GridData gdsecondShipLevel = new GridData(SWT.LEFT, SWT.CENTER, false, false, 1, 1);
gdsecondShipLevel.widthHint = SwtUtils.DPIAwareWidth(45);
if (logbook.data.context.GlobalContext.GTK3)
{
gdsecondShipLevel.widthHint = SwtUtils.DPIAwareWidth(110);
gdsecondShipLevel.heightHint = SwtUtils.DPIAwareHeight(36);
}
else
{
gdsecondShipLevel.widthHint = SwtUtils.DPIAwareWidth(45);
}
this.secondShipLevel.setLayoutData(gdsecondShipLevel);
this.secondShipLevel.setMaximum(ExpTable.MAX_LEVEL);
this.secondShipLevel.setMinimum(1);
Expand Down
61 changes: 55 additions & 6 deletions main/logbook/gui/ConfigDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,15 @@ public void widgetSelected(SelectionEvent e) {
proxyPortSpinner.setMinimum(1);
proxyPortSpinner.setSelection(AppConfig.get().getProxyPort());
GridData gdProxyPortSpinner = new GridData(SWT.LEFT, SWT.CENTER, false, false, 1, 1);
gdProxyPortSpinner.widthHint = SwtUtils.DPIAwareWidth(55);
if (logbook.data.context.GlobalContext.GTK3)
{
gdProxyPortSpinner.widthHint = SwtUtils.DPIAwareWidth(110);
gdProxyPortSpinner.heightHint = SwtUtils.DPIAwareHeight(36);
}
else
{
gdProxyPortSpinner.widthHint = SwtUtils.DPIAwareWidth(55);
}
proxyPortSpinner.setLayoutData(gdProxyPortSpinner);

final Button sendDatabaseButton = new Button(compositeConnection, SWT.CHECK);
Expand Down Expand Up @@ -380,7 +388,15 @@ public void widgetSelected(SelectionEvent e) {
materialintervalSpinner.setMinimum(10);
materialintervalSpinner.setSelection(AppConfig.get().getMaterialLogInterval());
GridData gdMaterialIntervalSpinner = new GridData(SWT.LEFT, SWT.CENTER, false, false, 1, 1);
gdMaterialIntervalSpinner.widthHint = SwtUtils.DPIAwareWidth(55);
if (logbook.data.context.GlobalContext.GTK3)
{
gdMaterialIntervalSpinner.widthHint = SwtUtils.DPIAwareWidth(110);
gdMaterialIntervalSpinner.heightHint = SwtUtils.DPIAwareHeight(36);
}
else
{
gdMaterialIntervalSpinner.widthHint = SwtUtils.DPIAwareWidth(55);
}
materialintervalSpinner.setLayoutData(gdMaterialIntervalSpinner);
new Label(compositeReport, SWT.NONE);

Expand Down Expand Up @@ -596,7 +612,15 @@ public void widgetSelected(SelectionEvent e) {
condSpinner.setMinimum(0);
condSpinner.setSelection(AppConfig.get().getOkCond());
GridData gdCondSpinner = new GridData(SWT.LEFT, SWT.CENTER, false, false, 1, 1);
gdCondSpinner.widthHint = SwtUtils.DPIAwareWidth(55);
if (logbook.data.context.GlobalContext.GTK3)
{
gdCondSpinner.widthHint = SwtUtils.DPIAwareWidth(110);
gdCondSpinner.heightHint = SwtUtils.DPIAwareHeight(36);
}
else
{
gdCondSpinner.widthHint = SwtUtils.DPIAwareWidth(55);
}
condSpinner.setLayoutData(gdCondSpinner);
new Label(compositeNotify, SWT.NONE);

Expand Down Expand Up @@ -629,7 +653,16 @@ public void widgetSelected(SelectionEvent e) {
intervalSpinner.setMinimum(10);
intervalSpinner.setSelection(AppConfig.get().getRemindInterbal());
GridData gdIntervalSpinner = new GridData(SWT.LEFT, SWT.CENTER, false, false, 1, 1);
gdIntervalSpinner.widthHint = SwtUtils.DPIAwareWidth(55);
if (logbook.data.context.GlobalContext.GTK3)
{
gdIntervalSpinner.widthHint = SwtUtils.DPIAwareWidth(110);
gdIntervalSpinner.heightHint = SwtUtils.DPIAwareHeight(36);
}
else
{
gdIntervalSpinner.widthHint = SwtUtils.DPIAwareWidth(55);
}

intervalSpinner.setLayoutData(gdIntervalSpinner);

new Label(compositeNotify, SWT.NONE);
Expand All @@ -648,7 +681,15 @@ public void widgetSelected(SelectionEvent e) {
fullySpinner.setMinimum(0);
fullySpinner.setSelection(AppConfig.get().getNotifyFully());
GridData gdFullySpinner = new GridData(SWT.LEFT, SWT.CENTER, false, false, 1, 1);
gdFullySpinner.widthHint = SwtUtils.DPIAwareWidth(55);
if (logbook.data.context.GlobalContext.GTK3)
{
gdFullySpinner.widthHint = SwtUtils.DPIAwareWidth(110);
gdFullySpinner.heightHint = SwtUtils.DPIAwareHeight(36);
}
else
{
gdFullySpinner.widthHint = SwtUtils.DPIAwareWidth(55);
}
fullySpinner.setLayoutData(gdFullySpinner);

Label fullyLabel2 = new Label(compositeNotify, SWT.NONE);
Expand Down Expand Up @@ -792,7 +833,15 @@ public void widgetSelected(SelectionEvent e) {
opaqueIntervalSpinner.setMinimum(0);
opaqueIntervalSpinner.setSelection(AppConfig.get().getOpaqueInterval());
GridData gdopaqueIntervalSpinner = new GridData(SWT.LEFT, SWT.CENTER, false, false, 1, 1);
gdopaqueIntervalSpinner.widthHint = SwtUtils.DPIAwareWidth(65);
if (logbook.data.context.GlobalContext.GTK3)
{
gdopaqueIntervalSpinner.widthHint = SwtUtils.DPIAwareWidth(130);
gdopaqueIntervalSpinner.heightHint = SwtUtils.DPIAwareHeight(36);
}
else
{
gdopaqueIntervalSpinner.widthHint = SwtUtils.DPIAwareWidth(65);
}
opaqueIntervalSpinner.setLayoutData(gdopaqueIntervalSpinner);

Label opaqueIntervalSuffix = new Label(opaqueIntervalGroup, SWT.NONE);
Expand Down