git://git.nikiroo.be
/
fanfix.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
importer frame: step 1
[fanfix.git]
/
src
/
be
/
nikiroo
/
fanfix_swing
/
gui
/
MainFrame.java
diff --git
a/src/be/nikiroo/fanfix_swing/gui/MainFrame.java
b/src/be/nikiroo/fanfix_swing/gui/MainFrame.java
index 9d25169c3e6276199324ed6423f1cecab101d9c2..313f086eb18f01b1d9b60654c0f19ad08f97900b 100644
(file)
--- a/
src/be/nikiroo/fanfix_swing/gui/MainFrame.java
+++ b/
src/be/nikiroo/fanfix_swing/gui/MainFrame.java
@@
-12,7
+12,6
@@
import javax.swing.JMenuBar;
import javax.swing.JMenuItem;
import javax.swing.JSplitPane;
import javax.swing.JMenuItem;
import javax.swing.JSplitPane;
-import be.nikiroo.fanfix_swing.Actions;
import be.nikiroo.utils.Version;
public class MainFrame extends JFrame {
import be.nikiroo.utils.Version;
public class MainFrame extends JFrame {
@@
-29,6
+28,7
@@
public class MainFrame extends JFrame {
detailsPanel = true;
browser = new BrowserPanel();
detailsPanel = true;
browser = new BrowserPanel();
+ books = new BooksPanel(true);
JComponent other = null;
boolean orientationH = true;
JComponent other = null;
boolean orientationH = true;
@@
-47,8
+47,6
@@
public class MainFrame extends JFrame {
other = split(goBack, details, false, 0.5, 1);
}
other = split(goBack, details, false, 0.5, 1);
}
- books = new BooksPanel(true);
-
browser.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
browser.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
@@
-96,7
+94,8
@@
public class MainFrame extends JFrame {
item1.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
item1.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
- Actions.imprt(MainFrame.this, true, new Runnable() {
+ // TODO: correctly use the importer (wip)
+ new ImporterFrame().imprtUrl(MainFrame.this, new Runnable() {
@Override
public void run() {
browser.reloadData();
@Override
public void run() {
browser.reloadData();
@@
-113,7
+112,8
@@
public class MainFrame extends JFrame {
item2.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
item2.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
- Actions.imprt(MainFrame.this, false, new Runnable() {
+ // TODO: correctly use the importer (wip)
+ new ImporterFrame().imprtFile(MainFrame.this, new Runnable() {
@Override
public void run() {
browser.reloadData();
@Override
public void run() {
browser.reloadData();