Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Minor timeline fixes and tooltip text

  • Loading branch information...
commit 0cebb07e853c86ee4dcfaadf6af21112a3ec1dc6 1 parent cd0c5c5
@mbastian mbastian authored
View
43 DesktopTimeline/src/org/gephi/desktop/timeline/BottomComponentImpl.java
@@ -1,6 +1,43 @@
/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
+ Copyright 2008-2011 Gephi
+ Authors : Mathieu Bastian
+ Website : http://www.gephi.org
+
+ This file is part of Gephi.
+
+ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+
+ Copyright 2011 Gephi Consortium. All rights reserved.
+
+ The contents of this file are subject to the terms of either the GNU
+ General Public License Version 3 only ("GPL") or the Common
+ Development and Distribution License("CDDL") (collectively, the
+ "License"). You may not use this file except in compliance with the
+ License. You can obtain a copy of the License at
+ http://gephi.org/about/legal/license-notice/
+ or /cddl-1.0.txt and /gpl-3.0.txt. See the License for the
+ specific language governing permissions and limitations under the
+ License. When distributing the software, include this License Header
+ Notice in each file and include the License files at
+ /cddl-1.0.txt and /gpl-3.0.txt. If applicable, add the following below the
+ License Header, with the fields enclosed by brackets [] replaced by
+ your own identifying information:
+ "Portions Copyrighted [year] [name of copyright owner]"
+
+ If you wish your version of this file to be governed by only the CDDL
+ or only the GPL Version 3, indicate your decision by adding
+ "[Contributor] elects to include this software in this distribution
+ under the [CDDL or GPL Version 3] license." If you do not indicate a
+ single choice of license, a recipient has the option to distribute
+ your version of this file under either the CDDL, the GPL Version 3 or
+ to extend the choice of license to its licensees as provided above.
+ However, if you add GPL Version 3 code and therefore, elected the GPL
+ Version 3 license, then the option applies only if the new code is
+ made subject to such option by the copyright holder.
+
+ Contributor(s):
+
+ Portions Copyrighted 2011 Gephi Consortium.
*/
package org.gephi.desktop.timeline;
@@ -10,7 +47,7 @@
/**
*
- * @author mbastian
+ * @author Mathieu Bastian
*/
@ServiceProvider(service=BottomComponent.class)
public class BottomComponentImpl implements BottomComponent {
View
2  DesktopTimeline/src/org/gephi/desktop/timeline/Bundle.properties
@@ -45,3 +45,5 @@ TimelineTooltip.min = Start
TimelineTooltip.max = End
TimelineTooltip.position = Current position is
TimelineTooltip.chart = Current value is
+TimelineTopComponent.enableTimelineButton.toolTipText=Enable timeline for time-based filtering
+TimelineTopComponent.disableButon.toolTipText=Disable the timeline
View
126 DesktopTimeline/src/org/gephi/desktop/timeline/CustomBoundsDialog.form
@@ -16,52 +16,47 @@
<Layout>
<DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0">
- <Component id="titleHeader" alignment="0" pref="588" max="32767" attributes="0"/>
- <Group type="102" alignment="0" attributes="0">
- <EmptySpace max="-2" attributes="0"/>
- <Component id="resetDefaultsDate" min="-2" max="-2" attributes="0"/>
- <EmptySpace pref="438" max="32767" attributes="0"/>
- </Group>
- <Group type="103" rootIndex="1" groupAlignment="0" attributes="0">
- <Group type="102" alignment="0" attributes="0">
- <EmptySpace min="-2" pref="36" max="-2" attributes="0"/>
- <Group type="103" groupAlignment="0" attributes="0">
- <Group type="102" alignment="0" attributes="0">
- <EmptySpace min="-2" pref="24" max="-2" attributes="0"/>
- <Group type="103" groupAlignment="1" attributes="0">
- <Component id="labelMinDate" min="-2" max="-2" attributes="0"/>
- <Component id="labelStartDate" min="-2" max="-2" attributes="0"/>
- </Group>
- <EmptySpace max="-2" attributes="0"/>
- <Group type="103" groupAlignment="0" attributes="0">
- <Component id="minTextField" min="-2" pref="162" max="-2" attributes="0"/>
- <Component id="startTextField" min="-2" pref="162" max="-2" attributes="0"/>
- </Group>
- <EmptySpace pref="67" max="32767" attributes="0"/>
- <Group type="103" groupAlignment="0" attributes="0">
- <Group type="102" alignment="1" attributes="0">
- <Component id="labelEndDate" min="-2" max="-2" attributes="0"/>
- <EmptySpace type="separate" max="-2" attributes="0"/>
- <Component id="endTextField" min="-2" pref="162" max="-2" attributes="0"/>
+ <Component id="titleHeader" alignment="0" pref="564" max="32767" attributes="0"/>
+ <Group type="102" attributes="0">
+ <Group type="103" groupAlignment="0" attributes="0">
+ <Group type="102" attributes="0">
+ <EmptySpace max="-2" attributes="0"/>
+ <Component id="resetDefaultsDate" min="-2" max="-2" attributes="0"/>
+ </Group>
+ <Group type="102" alignment="0" attributes="0">
+ <EmptySpace min="-2" pref="25" max="-2" attributes="0"/>
+ <Group type="103" groupAlignment="0" attributes="0">
+ <Group type="102" attributes="0">
+ <EmptySpace min="-2" pref="6" max="-2" attributes="0"/>
+ <Group type="103" groupAlignment="1" attributes="0">
+ <Component id="labelMinDate" min="-2" max="-2" attributes="0"/>
+ <Component id="labelStartDate" min="-2" max="-2" attributes="0"/>
+ </Group>
+ <EmptySpace max="-2" attributes="0"/>
+ <Group type="103" groupAlignment="0" max="-2" attributes="0">
+ <Group type="102" attributes="0">
+ <Component id="minTextField" min="-2" pref="162" max="-2" attributes="0"/>
+ <EmptySpace min="-2" pref="47" max="-2" attributes="0"/>
+ <Component id="labelMaxDate" min="-2" max="-2" attributes="0"/>
+ </Group>
+ <Group type="102" attributes="0">
+ <Component id="startTextField" min="-2" pref="162" max="-2" attributes="0"/>
+ <EmptySpace max="32767" attributes="0"/>
+ <Component id="labelEndDate" min="-2" max="-2" attributes="0"/>
+ </Group>
</Group>
- <Group type="102" alignment="1" attributes="0">
- <Component id="labelMaxDate" min="-2" max="-2" attributes="0"/>
- <EmptySpace max="-2" attributes="0"/>
+ <EmptySpace max="-2" attributes="0"/>
+ <Group type="103" groupAlignment="0" attributes="0">
<Component id="maxTextField" min="-2" pref="162" max="-2" attributes="0"/>
- <EmptySpace min="-2" pref="1" max="-2" attributes="0"/>
+ <Component id="endTextField" min="-2" pref="162" max="-2" attributes="0"/>
</Group>
</Group>
- </Group>
- <Group type="102" alignment="0" attributes="0">
- <Group type="103" groupAlignment="0" attributes="0">
- <Component id="labelBounds" alignment="0" min="-2" max="-2" attributes="0"/>
- <Component id="labelIntervalDate" alignment="0" min="-2" max="-2" attributes="0"/>
- </Group>
- <EmptySpace min="-2" pref="464" max="-2" attributes="0"/>
+ <Component id="labelIntervalDate" min="-2" max="-2" attributes="0"/>
+ <Component id="labelBounds" min="-2" max="-2" attributes="0"/>
</Group>
</Group>
- <EmptySpace min="-2" pref="36" max="-2" attributes="0"/>
</Group>
+ <EmptySpace max="32767" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
@@ -69,40 +64,27 @@
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0">
<Component id="titleHeader" min="-2" pref="83" max="-2" attributes="0"/>
- <EmptySpace pref="200" max="32767" attributes="0"/>
- <Component id="resetDefaultsDate" min="-2" max="-2" attributes="0"/>
- <EmptySpace max="-2" attributes="0"/>
- </Group>
- <Group type="103" rootIndex="1" groupAlignment="0" attributes="0">
- <Group type="102" alignment="0" attributes="0">
- <EmptySpace min="-2" pref="105" max="-2" attributes="0"/>
- <Component id="labelBounds" min="-2" max="-2" attributes="0"/>
- <Group type="103" groupAlignment="0" attributes="0">
- <Group type="102" alignment="0" attributes="0">
- <EmptySpace min="-2" pref="87" max="-2" attributes="0"/>
- <Group type="103" groupAlignment="3" attributes="0">
- <Component id="labelEndDate" alignment="3" min="-2" max="-2" attributes="0"/>
- <Component id="endTextField" alignment="3" min="-2" max="-2" attributes="0"/>
- </Group>
- </Group>
- <Group type="102" alignment="0" attributes="0">
- <Group type="103" groupAlignment="3" attributes="0">
- <Component id="labelMinDate" alignment="3" min="-2" max="-2" attributes="0"/>
- <Component id="minTextField" alignment="3" min="-2" max="-2" attributes="0"/>
- <Component id="labelMaxDate" alignment="3" min="-2" max="-2" attributes="0"/>
- <Component id="maxTextField" alignment="3" min="-2" max="-2" attributes="0"/>
- </Group>
- <EmptySpace min="-2" pref="29" max="-2" attributes="0"/>
- <Component id="labelIntervalDate" min="-2" max="-2" attributes="0"/>
- <EmptySpace type="unrelated" max="-2" attributes="0"/>
- <Group type="103" groupAlignment="3" attributes="0">
- <Component id="labelStartDate" alignment="3" min="-2" max="-2" attributes="0"/>
- <Component id="startTextField" alignment="3" min="-2" max="-2" attributes="0"/>
- </Group>
- </Group>
- </Group>
- <EmptySpace pref="91" max="32767" attributes="0"/>
+ <EmptySpace type="separate" max="-2" attributes="0"/>
+ <Component id="labelBounds" min="-2" max="-2" attributes="0"/>
+ <EmptySpace type="unrelated" max="-2" attributes="0"/>
+ <Group type="103" groupAlignment="3" attributes="0">
+ <Component id="labelMinDate" alignment="3" min="-2" max="-2" attributes="0"/>
+ <Component id="minTextField" alignment="3" min="-2" max="-2" attributes="0"/>
+ <Component id="labelMaxDate" alignment="3" min="-2" max="-2" attributes="0"/>
+ <Component id="maxTextField" alignment="3" min="-2" max="-2" attributes="0"/>
</Group>
+ <EmptySpace type="separate" max="-2" attributes="0"/>
+ <Component id="labelIntervalDate" min="-2" max="-2" attributes="0"/>
+ <EmptySpace min="-2" pref="10" max="-2" attributes="0"/>
+ <Group type="103" groupAlignment="3" attributes="0">
+ <Component id="startTextField" alignment="3" min="-2" max="-2" attributes="0"/>
+ <Component id="labelStartDate" alignment="3" min="-2" max="-2" attributes="0"/>
+ <Component id="labelEndDate" alignment="3" min="-2" max="-2" attributes="0"/>
+ <Component id="endTextField" alignment="3" min="-2" max="-2" attributes="0"/>
+ </Group>
+ <EmptySpace type="separate" max="-2" attributes="0"/>
+ <Component id="resetDefaultsDate" min="-2" max="-2" attributes="0"/>
+ <EmptySpace pref="43" max="32767" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
View
106 DesktopTimeline/src/org/gephi/desktop/timeline/CustomBoundsDialog.java
@@ -376,73 +376,61 @@ private void initComponents() {
this.setLayout(layout);
layout.setHorizontalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addComponent(titleHeader, javax.swing.GroupLayout.DEFAULT_SIZE, 588, Short.MAX_VALUE)
+ .addComponent(titleHeader, javax.swing.GroupLayout.DEFAULT_SIZE, 564, Short.MAX_VALUE)
.addGroup(layout.createSequentialGroup()
- .addContainerGap()
- .addComponent(resetDefaultsDate)
- .addContainerGap(438, Short.MAX_VALUE))
- .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(layout.createSequentialGroup()
- .addGap(36, 36, 36)
- .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(layout.createSequentialGroup()
- .addGap(24, 24, 24)
- .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
- .addComponent(labelMinDate)
- .addComponent(labelStartDate))
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addComponent(minTextField, javax.swing.GroupLayout.PREFERRED_SIZE, 162, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addComponent(startTextField, javax.swing.GroupLayout.PREFERRED_SIZE, 162, javax.swing.GroupLayout.PREFERRED_SIZE))
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 18, Short.MAX_VALUE)
- .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
- .addComponent(labelEndDate)
- .addGap(18, 18, 18)
- .addComponent(endTextField, javax.swing.GroupLayout.PREFERRED_SIZE, 162, javax.swing.GroupLayout.PREFERRED_SIZE))
- .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
- .addComponent(labelMaxDate)
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(layout.createSequentialGroup()
+ .addContainerGap()
+ .addComponent(resetDefaultsDate))
+ .addGroup(layout.createSequentialGroup()
+ .addGap(25, 25, 25)
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(layout.createSequentialGroup()
+ .addGap(6, 6, 6)
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
+ .addComponent(labelMinDate)
+ .addComponent(labelStartDate))
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
+ .addGroup(layout.createSequentialGroup()
+ .addComponent(minTextField, javax.swing.GroupLayout.PREFERRED_SIZE, 162, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addGap(47, 47, 47)
+ .addComponent(labelMaxDate))
+ .addGroup(layout.createSequentialGroup()
+ .addComponent(startTextField, javax.swing.GroupLayout.PREFERRED_SIZE, 162, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addComponent(labelEndDate)))
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(maxTextField, javax.swing.GroupLayout.PREFERRED_SIZE, 162, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addGap(1, 1, 1))))
- .addGroup(layout.createSequentialGroup()
- .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addComponent(labelBounds)
- .addComponent(labelIntervalDate))
- .addGap(464, 464, 464)))
- .addGap(36, 36, 36)))
+ .addComponent(endTextField, javax.swing.GroupLayout.PREFERRED_SIZE, 162, javax.swing.GroupLayout.PREFERRED_SIZE)))
+ .addComponent(labelIntervalDate)
+ .addComponent(labelBounds))))
+ .addContainerGap())
);
layout.setVerticalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(layout.createSequentialGroup()
.addComponent(titleHeader, javax.swing.GroupLayout.PREFERRED_SIZE, 83, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 200, Short.MAX_VALUE)
+ .addGap(18, 18, 18)
+ .addComponent(labelBounds)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(labelMinDate)
+ .addComponent(minTextField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(labelMaxDate)
+ .addComponent(maxTextField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addGap(18, 18, 18)
+ .addComponent(labelIntervalDate)
+ .addGap(10, 10, 10)
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(startTextField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(labelStartDate)
+ .addComponent(labelEndDate)
+ .addComponent(endTextField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addGap(18, 18, 18)
.addComponent(resetDefaultsDate)
- .addContainerGap())
- .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(layout.createSequentialGroup()
- .addGap(105, 105, 105)
- .addComponent(labelBounds)
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
- .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(layout.createSequentialGroup()
- .addGap(87, 87, 87)
- .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
- .addComponent(labelEndDate)
- .addComponent(endTextField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))
- .addGroup(layout.createSequentialGroup()
- .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
- .addComponent(labelMinDate)
- .addComponent(minTextField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addComponent(labelMaxDate)
- .addComponent(maxTextField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
- .addGap(29, 29, 29)
- .addComponent(labelIntervalDate)
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
- .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
- .addComponent(labelStartDate)
- .addComponent(startTextField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))))
- .addContainerGap(79, Short.MAX_VALUE)))
+ .addContainerGap(43, Short.MAX_VALUE))
);
}// </editor-fold>//GEN-END:initComponents
// Variables declaration - do not modify//GEN-BEGIN:variables
View
49 DesktopTimeline/src/org/gephi/desktop/timeline/PlaySettingsDialog.form
@@ -1,4 +1,4 @@
-<?xml version="1.1" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
<Form version="1.5" maxVersion="1.7" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
<NonVisualComponents>
@@ -22,30 +22,7 @@
<Group type="103" groupAlignment="0" attributes="0">
<Component id="headerTitle" alignment="0" pref="436" max="32767" attributes="0"/>
<Group type="102" alignment="0" attributes="0">
- <EmptySpace max="-2" attributes="0"/>
- <Component id="labelSpeed" min="-2" max="-2" attributes="0"/>
- <EmptySpace pref="375" max="32767" attributes="0"/>
- </Group>
- <Group type="102" alignment="0" attributes="0">
- <EmptySpace min="-2" pref="45" max="-2" attributes="0"/>
- <Group type="103" groupAlignment="1" attributes="0">
- <Component id="labelDelay" min="-2" max="-2" attributes="0"/>
- <Component id="labelStepSize" min="-2" max="-2" attributes="0"/>
- </Group>
- <EmptySpace max="-2" attributes="0"/>
- <Group type="103" groupAlignment="0" max="-2" attributes="0">
- <Component id="stepSizeSpinner" min="-2" pref="81" max="-2" attributes="1"/>
- <Component id="delaySpinner" alignment="0" min="-2" pref="81" max="-2" attributes="1"/>
- </Group>
- <EmptySpace max="-2" attributes="0"/>
- <Group type="103" groupAlignment="0" attributes="0">
- <Component id="labelMs" min="-2" max="-2" attributes="0"/>
- <Component id="labelPerc" min="-2" max="-2" attributes="0"/>
- </Group>
- <EmptySpace pref="211" max="32767" attributes="0"/>
- </Group>
- <Group type="102" alignment="0" attributes="0">
- <EmptySpace max="-2" attributes="0"/>
+ <EmptySpace min="-2" pref="35" max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Component id="labelMode" alignment="0" min="-2" max="-2" attributes="0"/>
<Group type="102" alignment="0" attributes="0">
@@ -59,8 +36,26 @@
</Group>
</Group>
</Group>
+ <Component id="labelSpeed" alignment="0" min="-2" max="-2" attributes="0"/>
+ <Group type="102" alignment="0" attributes="0">
+ <EmptySpace min="-2" pref="39" max="-2" attributes="0"/>
+ <Group type="103" groupAlignment="1" attributes="0">
+ <Component id="labelDelay" min="-2" max="-2" attributes="0"/>
+ <Component id="labelStepSize" min="-2" max="-2" attributes="0"/>
+ </Group>
+ <EmptySpace max="-2" attributes="0"/>
+ <Group type="103" groupAlignment="0" max="-2" attributes="0">
+ <Component id="stepSizeSpinner" min="-2" pref="81" max="-2" attributes="1"/>
+ <Component id="delaySpinner" alignment="0" min="-2" pref="81" max="-2" attributes="1"/>
+ </Group>
+ <EmptySpace max="-2" attributes="0"/>
+ <Group type="103" groupAlignment="0" attributes="0">
+ <Component id="labelMs" min="-2" max="-2" attributes="0"/>
+ <Component id="labelPerc" min="-2" max="-2" attributes="0"/>
+ </Group>
+ </Group>
</Group>
- <EmptySpace pref="167" max="32767" attributes="0"/>
+ <EmptySpace max="32767" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
@@ -91,7 +86,7 @@
</Group>
<EmptySpace type="separate" max="-2" attributes="0"/>
<Component id="backwardCheckbox" min="-2" max="-2" attributes="0"/>
- <EmptySpace min="-2" max="-2" attributes="0"/>
+ <EmptySpace pref="39" max="32767" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
View
40 DesktopTimeline/src/org/gephi/desktop/timeline/PlaySettingsDialog.java
@@ -155,25 +155,7 @@ private void initComponents() {
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(headerTitle, javax.swing.GroupLayout.DEFAULT_SIZE, 436, Short.MAX_VALUE)
.addGroup(layout.createSequentialGroup()
- .addContainerGap()
- .addComponent(labelSpeed)
- .addContainerGap(375, Short.MAX_VALUE))
- .addGroup(layout.createSequentialGroup()
- .addGap(45, 45, 45)
- .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
- .addComponent(labelDelay)
- .addComponent(labelStepSize))
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
- .addComponent(stepSizeSpinner, javax.swing.GroupLayout.PREFERRED_SIZE, 81, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addComponent(delaySpinner, javax.swing.GroupLayout.PREFERRED_SIZE, 81, javax.swing.GroupLayout.PREFERRED_SIZE))
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addComponent(labelMs)
- .addComponent(labelPerc))
- .addContainerGap(211, Short.MAX_VALUE))
- .addGroup(layout.createSequentialGroup()
- .addContainerGap()
+ .addGap(35, 35, 35)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(labelMode)
.addGroup(layout.createSequentialGroup()
@@ -183,8 +165,22 @@ private void initComponents() {
.addGroup(layout.createSequentialGroup()
.addComponent(oneBoundRadio)
.addGap(18, 18, 18)
- .addComponent(twoBoundsRadio)))))
- .addContainerGap(167, Short.MAX_VALUE))
+ .addComponent(twoBoundsRadio))))
+ .addComponent(labelSpeed)
+ .addGroup(layout.createSequentialGroup()
+ .addGap(39, 39, 39)
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
+ .addComponent(labelDelay)
+ .addComponent(labelStepSize))
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
+ .addComponent(stepSizeSpinner, javax.swing.GroupLayout.PREFERRED_SIZE, 81, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(delaySpinner, javax.swing.GroupLayout.PREFERRED_SIZE, 81, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(labelMs)
+ .addComponent(labelPerc))))
+ .addContainerGap())
);
layout.setVerticalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
@@ -210,7 +206,7 @@ private void initComponents() {
.addComponent(twoBoundsRadio))
.addGap(18, 18, 18)
.addComponent(backwardCheckbox)
- .addContainerGap())
+ .addContainerGap(39, Short.MAX_VALUE))
);
}// </editor-fold>//GEN-END:initComponents
// Variables declaration - do not modify//GEN-BEGIN:variables
View
4 DesktopTimeline/src/org/gephi/desktop/timeline/TickGraph.java
@@ -170,7 +170,7 @@ private void drawDate(Graphics2D g) {
if (bigFont != null) {
String label = dateTick.getTickValue(TOP_TICK, interval.getStart());
int xLabel = x + 4;
- g.setColor(parameters.getDateColor(1));
+ g.setColor(parameters.getDateColor(TOP_TICK));
int y = (int) (fontSize * 4);
g.drawString(label, xLabel, y);
@@ -179,7 +179,7 @@ private void drawDate(Graphics2D g) {
if (bigFont != null) {
String label = dateTick.getTickValue(TOP_TICK, interval.getStart());
- g.setColor(parameters.getDateColor(1));
+ g.setColor(parameters.getDateColor(TOP_TICK));
int y = (int) (fontSize * 4);
g.drawString(label, 4, y);
View
4 DesktopTimeline/src/org/gephi/desktop/timeline/TickParameters.java
@@ -59,8 +59,8 @@ Development and Distribution License("CDDL") (collectively, the
private int fontSize = 12;
private double fontFactor = 6.;
private Font font = new Font("Helvetica", Font.PLAIN, fontSize);
- private Color[] realColors = new Color[]{new Color(0xB4B4B4), new Color(0x5A5A5A), new Color(0x1E1E1E)};
- private Color[] dateColors = new Color[]{new Color(0x999999), new Color(0xCCCCCC)};
+ private Color[] realColors = new Color[]{new Color(0xB4B4B4), new Color(0x5A5A5A), new Color(0x1E1E1E)};
+ private Color[] dateColors = new Color[]{new Color(0xB4B4B4), new Color(0x5A5A5A)};
public TickParameters(TickType type) {
this.type = type;
View
10 DesktopTimeline/src/org/gephi/desktop/timeline/TimelineTopComponent.form
@@ -3,10 +3,10 @@
<Form version="1.5" maxVersion="1.7" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
<Properties>
<Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
- <Dimension value="[32767, 58]"/>
+ <Dimension value="[32767, 68]"/>
</Property>
<Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
- <Dimension value="[414, 58]"/>
+ <Dimension value="[414, 68]"/>
</Property>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[424, 68]"/>
@@ -67,6 +67,9 @@
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
<ResourceString bundle="org/gephi/desktop/timeline/Bundle.properties" key="TimelineTopComponent.enableTimelineButton.text" replaceFormat="NbBundle.getMessage (TimelineTopComponent.class, &quot;{key}&quot;)"/>
</Property>
+ <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+ <ResourceString bundle="org/gephi/desktop/timeline/Bundle.properties" key="TimelineTopComponent.enableTimelineButton.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+ </Property>
<Property name="focusable" type="boolean" value="false"/>
<Property name="horizontalTextPosition" type="int" value="4"/>
<Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor">
@@ -173,6 +176,9 @@
<Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
<Image iconType="3" name="/org/gephi/desktop/timeline/resources/cross.png"/>
</Property>
+ <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+ <ResourceString bundle="org/gephi/desktop/timeline/Bundle.properties" key="TimelineTopComponent.disableButon.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+ </Property>
<Property name="focusable" type="boolean" value="false"/>
<Property name="horizontalTextPosition" type="int" value="0"/>
<Property name="iconTextGap" type="int" value="0"/>
View
6 DesktopTimeline/src/org/gephi/desktop/timeline/TimelineTopComponent.java
@@ -342,8 +342,8 @@ private void initComponents() {
timelinePanel = new org.gephi.desktop.timeline.TimelineDrawer();
closeButton = new CloseButton();
- setMaximumSize(new java.awt.Dimension(32767, 58));
- setMinimumSize(new java.awt.Dimension(414, 58));
+ setMaximumSize(new java.awt.Dimension(32767, 68));
+ setMinimumSize(new java.awt.Dimension(414, 68));
setPreferredSize(new java.awt.Dimension(424, 68));
setLayout(new java.awt.GridBagLayout());
@@ -357,6 +357,7 @@ private void initComponents() {
enableTimelineButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/gephi/desktop/timeline/resources/activate.png"))); // NOI18N
org.openide.awt.Mnemonics.setLocalizedText(enableTimelineButton, NbBundle.getMessage (TimelineTopComponent.class, "TimelineTopComponent.enableTimelineButton.text")); // NOI18N
+ enableTimelineButton.setToolTipText(org.openide.util.NbBundle.getMessage(TimelineTopComponent.class, "TimelineTopComponent.enableTimelineButton.toolTipText")); // NOI18N
enableTimelineButton.setFocusable(false);
enableTimelineButton.setHorizontalTextPosition(javax.swing.SwingConstants.RIGHT);
enableTimelineButton.setMargin(new java.awt.Insets(4, 6, 4, 6));
@@ -404,6 +405,7 @@ private void initComponents() {
innerToolbar.setOpaque(false);
disableButon.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/gephi/desktop/timeline/resources/cross.png"))); // NOI18N
+ disableButon.setToolTipText(org.openide.util.NbBundle.getMessage(TimelineTopComponent.class, "TimelineTopComponent.disableButon.toolTipText")); // NOI18N
disableButon.setFocusable(false);
disableButon.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
disableButon.setIconTextGap(0);
View
2  DesktopTimeline/src/org/gephi/desktop/timeline/layer.xml
@@ -15,7 +15,7 @@
<folder name="Window">
<file name="org-gephi-desktop-timeline-TimelineWindowAction.shadow">
<attr name="originalFile" stringvalue="Actions/Window/org-gephi-desktop-timeline-TimelineWindowAction.instance"/>
- <attr name="position" intvalue="1200"/>
+ <attr name="position" intvalue="1250"/>
</file>
</folder>
</folder>
Please sign in to comment.
Something went wrong with that request. Please try again.