[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    koffice/kspread
From:       Ariya Hidayat <ariya () kde ! org>
Date:       2005-02-28 4:40:23
Message-ID: 20050228044023.11BC9148A2 () office ! kde ! org
[Download RAW message or body]

CVS commit by ariya: 

action+command to remove a link

CCBUGS: 76861


  M +3 -2      commands.cc   1.23
  M +2 -1      kspread.rc   1.120
  M +20 -0     kspread_view.cc   1.811
  M +1 -0      kspread_view.h   1.257


--- koffice/kspread/commands.cc  #1.22:1.23
@@ -545,4 +545,5 @@ void LinkCommand::execute()
   if( !cell ) return;
   
+  if( !newText.isEmpty() )
   cell->setCellText( newText );
   cell->setLink( newLink  );
@@ -563,5 +564,5 @@ void LinkCommand::unexecute()
 QString LinkCommand::name() const
 {
-  return i18n("Set Link");
+  return newLink.isEmpty() ? i18n("Remove Link") : i18n("Set Link");
 }
 

--- koffice/kspread/kspread.rc  #1.119:1.120
@@ -1,3 +1,3 @@
-<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd" ><kpartgui name="KSpread" version="24">
+<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd" ><kpartgui name="KSpread" version="25">
 <MenuBar>
  <Menu name="file"><text>&amp;File</text>
@@ -32,4 +32,5 @@
   </Menu>
   <Action name="delete"/>
+  <Action name="removeHyperlink"/>
   <Separator/>
   <Action name="conditional"/>

--- koffice/kspread/kspread_view.cc  #1.810:1.811
@@ -556,4 +556,5 @@ public:
     KSelectAction* formulaSelection;
     KAction* insertLink;
+    KAction* removeLink;
     KAction* consolidate;
     KAction* goalSeek;
@@ -972,4 +973,8 @@ void ViewPrivate::initActions()
   actions->insertLink->setToolTip(i18n("Insert an Internet hyperlink."));
 
+  actions->removeLink = new KAction( i18n("&Remove Link"),
+      0, view, SLOT( removeHyperlink() ), ac, "removeHyperlink" );
+  actions->removeLink->setToolTip(i18n("Remove a link."));
+  
   actions->insertSpecialChar = new KAction( i18n( "S&pecial Character..." ), "char",
       view, SLOT( insertSpecialChar() ), ac, "insertSpecialChar" );
@@ -4308,4 +4313,19 @@ void KSpreadView::sort()
 }
 
+void KSpreadView::removeHyperlink()
+{
+    QPoint marker( selectionInfo()->marker() );
+    KSpreadCell * cell = d->activeSheet->cellAt( marker );
+    if( !cell ) return;    
+    if( cell->link().isEmpty() ) return;
+    
+    LinkCommand* command = new LinkCommand( cell, QString::null, QString::null );
+    d->doc->addCommand( command );
+    command->execute();
+    
+        canvasWidget()->setFocus();
+        editWidget()->setText( cell->text() );
+}
+
 void KSpreadView::insertHyperlink()
 {

--- koffice/kspread/kspread_view.h  #1.256:1.257
@@ -311,4 +311,5 @@ public slots:
     void sort();
     void insertHyperlink();
+    void removeHyperlink();
     void goalSeek();
     void multipleOperations();


[prev in list] [next in list] [prev in thread] [next in thread]