| Summary: | kmplot use of toolbar entries coordinate systems | ||
|---|---|---|---|
| Product: | [Applications] kmplot | Reporter: | Reissner <rei3ner> |
| Component: | general | Assignee: | Klaus-Dieter M <kd.moeller> |
| Status: | RESOLVED FIXED | ||
| Severity: | wishlist | ||
| Priority: | NOR | ||
| Version First Reported In: | unspecified | ||
| Target Milestone: | --- | ||
| Platform: | unspecified | ||
| OS: | Linux | ||
| Latest Commit: | Version Fixed/Implemented In: | ||
| Sentry Crash Report: | |||
|
Description
Reissner
2006-12-21 19:26:50 UTC
SVN commit 651573 by saxton:
Replace "Coordinate System {I,II,III}" actions with "Reset View". The three actions were excessive since the coordinates can be changed quickly anyway; one action to reset the view is enough.
BUG: 139106
D icons/actions/hi16-action-ksys1.png
D icons/actions/hi16-action-ksys2.png
D icons/actions/hi16-action-ksys3.png
A icons/actions/hi16-action-resetview.png icons/actions/hi16-action-ksys1.png#651572
D icons/actions/hi22-action-ksys1.png
D icons/actions/hi22-action-ksys2.png
D icons/actions/hi22-action-ksys3.png
A icons/actions/hi22-action-resetview.png icons/actions/hi22-action-ksys1.png#651572
D icons/actions/hi32-action-ksys1.png
D icons/actions/hi32-action-ksys2.png
D icons/actions/hi32-action-ksys3.png
A icons/actions/hi32-action-resetview.png icons/actions/hi32-action-ksys1.png#651572
D icons/actions/hi48-action-ksys1.png
D icons/actions/hi48-action-ksys2.png
D icons/actions/hi48-action-ksys3.png
A icons/actions/hi48-action-resetview.png icons/actions/hi48-action-ksys1.png#651572
D icons/actions/hisc-action-ksys1.svgz
D icons/actions/hisc-action-ksys2.svgz
D icons/actions/hisc-action-ksys3.svgz
A icons/actions/hisc-action-resetview.svgz icons/actions/hisc-action-ksys1.svgz#651572
M +4 -8 kmplot/kmplot_part.rc
M +4 -7 kmplot/kmplot_part_readonly.rc
M +6 -27 kmplot/maindlg.cpp
M +2 -6 kmplot/maindlg.h
M +1 -3 kmplot/org.kde.kmplot.MainDlg.xml
--- trunk/KDE/kdeedu/kmplot/kmplot/kmplot_part.rc #651572:651573
@@ -1,5 +1,5 @@
<!DOCTYPE kpartgui>
-<kpartgui name="kmplot" version="14">
+<kpartgui name="kmplot" version="15">
<MenuBar>
<Menu name="file">
<Action name="file_openrecent"/>
@@ -22,11 +22,9 @@
<Action name="zoom_out"/>
<Action name="zoom_trig"/>
<Separator/>
+ <Action name="reset_view"/>
+ <Separator/>
<Action name="options_configure_show_sliders"/>
- <Separator />
- <Action name="coord_i"/>
- <Action name="coord_ii"/>
- <Action name="coord_iii"/>
</Menu>
<Menu name="tools"><text>&Tools</text>
<Action name="yvalue"/>
@@ -49,10 +47,8 @@
<Separator />
<Action name="zoom_in"/>
<Action name="zoom_out"/>
+ <Action name="reset_view"/>
<Separator />
- <Action name="coord_i"/>
- <Action name="coord_ii"/>
- <Action name="coord_iii"/>
<Action name="helpcontents"/>
</ToolBar>
--- trunk/KDE/kdeedu/kmplot/kmplot/kmplot_part_readonly.rc #651572:651573
@@ -1,5 +1,5 @@
<!DOCTYPE kpartgui>
-<kpartgui name="kmplot" version="8">
+<kpartgui name="kmplot" version="9">
<MenuBar>
<Menu name="file">
<Action name="file_save_as"/>
@@ -18,11 +18,10 @@
<Action name="zoom_out"/>
<Action name="zoom_trig"/>
<Separator/>
+ <Action name="reset_view"/>
+ <Separator/>
<Action name="options_configure_show_sliders"/>
<Separator />
- <Action name="coord_i"/>
- <Action name="coord_ii"/>
- <Action name="coord_iii"/>
</Menu>
<Menu name="tools"><text>&Tools</text>
<Action name="yvalue"/>
@@ -40,10 +39,8 @@
<ToolBar name="mainToolBar">
<Action name="zoom_in"/>
<Action name="zoom_out"/>
+ <Action name="reset_view"/>
<Separator />
- <Action name="coord_i"/>
- <Action name="coord_ii"/>
- <Action name="coord_iii"/>
<Action name="helpcontents"/>
</ToolBar>
</kpartgui>
--- trunk/KDE/kdeedu/kmplot/kmplot/maindlg.cpp #651572:651573
@@ -52,6 +52,7 @@
#include <krecentfilesaction.h>
#include <kactioncollection.h>
#include <kicon.h>
+#include <kiconloader.h>
// local includes
#include "functiontools.h"
@@ -285,20 +286,10 @@
zoomTrig->setText( i18n("&Fit Widget to Trigonometric Functions") );
connect( zoomTrig, SIGNAL(triggered(bool)), View::self(), SLOT( zoomToTrigonometric() ) );
- QAction * coordI = actionCollection()->addAction( "coord_i" );
- coordI->setText( i18n( "Coordinate System I" ) );
- coordI->setIcon( KIcon("ksys1.png") );
- connect( coordI, SIGNAL(triggered(bool)), this, SLOT( slotCoord1() ) );
-
- QAction * coordII = actionCollection()->addAction( "coord_ii" );
- coordII->setText( i18n( "Coordinate System II" ) );
- coordII->setIcon( KIcon("ksys2.png") );
- connect( coordII, SIGNAL(triggered(bool)), this, SLOT( slotCoord2() ) );
-
- QAction * coordIII = actionCollection()->addAction( "coord_iii" );
- coordIII->setText( i18n( "Coordinate System III" ) );
- coordIII->setIcon( KIcon("ksys3.png") );
- connect( coordIII, SIGNAL(triggered(bool)), this, SLOT( slotCoord3() ) );
+ QAction * resetView = actionCollection()->addAction( "reset_view" );
+ resetView->setText( i18n( "Reset View" ) );
+ resetView->setIcon( KIcon("resetview") );
+ connect( resetView, SIGNAL(triggered(bool)), this, SLOT( slotResetView() ) );
//END view menu
@@ -690,24 +681,12 @@
}
-void MainDlg::slotCoord1()
+void MainDlg::slotResetView()
{
View::self()->animateZoom( QRectF( -8, -8, 16, 16 ) );
m_modified = true;
}
-void MainDlg::slotCoord2()
-{
- View::self()->animateZoom( QRectF( 0, -8, 16, 16 ) );
- m_modified = true;
-}
-
-void MainDlg::slotCoord3()
-{
- View::self()->animateZoom( QRectF( 0, 0, 16, 16 ) );
- m_modified = true;
-}
-
void MainDlg::slotSettings()
{
// An instance of your dialog has already been created and has been cached,
--- trunk/KDE/kdeedu/kmplot/kmplot/maindlg.h #651572:651573
@@ -139,12 +139,8 @@
void slotSettings();
/// Calls the common function names dialog.
void slotNames();
- /// Change the coordinate systems, shows negative x-values and negative y-values.
- void slotCoord1();
- /// Change the coordinate systems, shows positive x-values and negative y-values.
- void slotCoord2();
- /// Change the coordinate systems, shows positive x-values and positive y-values.
- void slotCoord3();
+ /// Resets the view
+ void slotResetView();
/// Tools menu
void getYValue();
void findMinimumValue();
--- trunk/KDE/kdeedu/kmplot/kmplot/org.kde.kmplot.MainDlg.xml #651572:651573
@@ -10,9 +10,7 @@
<method name="slotExport"/>
<method name="slotSettings"/>
<method name="slotNames"/>
- <method name="slotCoord1"/>
- <method name="slotCoord2"/>
- <method name="slotCoord3"/>
+ <method name="slotResetView"/>
<method name="getYValue"/>
<method name="findMinimumValue"/>
<method name="findMaximumValue"/>
|