From 391a019b8b9b4e3e648add671a2bf12ff9e8be04 Mon Sep 17 00:00:00 2001 From: Damien Elmes Date: Tue, 7 Dec 2010 18:03:43 +0900 Subject: [PATCH] new layout icon; link from main screen --- ankiqt/ui/facteditor.py | 2 +- ankiqt/ui/main.py | 8 ++++++++ designer/main.ui | 15 ++++++++++++++- designer/modelproperties.ui | 8 +++++++- icons.qrc | 1 + icons/layout.png | Bin 0 -> 1796 bytes 6 files changed, 31 insertions(+), 3 deletions(-) create mode 100644 icons/layout.png diff --git a/ankiqt/ui/facteditor.py b/ankiqt/ui/facteditor.py index 2acc8bc1f..5a0fd115c 100644 --- a/ankiqt/ui/facteditor.py +++ b/ankiqt/ui/facteditor.py @@ -126,7 +126,7 @@ class FactEditor(object): self.clayout.setSizePolicy(QSizePolicy.Preferred,QSizePolicy.Preferred) self.clayout.setFixedHeight(20) # self.clayout.setFixedWidth(48) - self.clayout.setIcon(QIcon(":/icons/edit.png")) + self.clayout.setIcon(QIcon(":/icons/layout.png")) #self.clayout.setIconSize(QSize(32,32)) self.clayout.setToolTip(_("Edit how cards are displayed (F2)")) self.clayout.setShortcut(_("F2")) diff --git a/ankiqt/ui/main.py b/ankiqt/ui/main.py index 542ba2f0d..3c2af1e79 100755 --- a/ankiqt/ui/main.py +++ b/ankiqt/ui/main.py @@ -1787,6 +1787,7 @@ learnt today") mw = self.mainWin mw.toolBar.addAction(mw.actionAddcards) mw.toolBar.addAction(mw.actionEditCurrent) + mw.toolBar.addAction(mw.actionEditLayout) mw.toolBar.addAction(mw.actionEditdeck) mw.toolBar.addAction(mw.actionStudyOptions) mw.toolBar.addAction(mw.actionGraphs) @@ -1911,6 +1912,10 @@ learnt today") def onEditCurrent(self): self.moveToState("editCurrentFact") + def onCardLayout(self): + ui.clayout.CardLayout(self, None, self.currentCard.fact.model, + card=self.currentCard) + def onDeckProperties(self): self.deckProperties = ui.deckproperties.DeckProperties(self, self.deck) @@ -2433,6 +2438,7 @@ This deck already exists on your computer. Overwrite the local copy?"""), self.connect(m.actionDstats, s, self.onDeckStats) self.connect(m.actionCstats, s, self.onCardStats) self.connect(m.actionGraphs, s, self.onShowGraph) + self.connect(m.actionEditLayout, s, self.onCardLayout) self.connect(m.actionAbout, s, self.onAbout) self.connect(m.actionReportbug, s, self.onReportBug) self.connect(m.actionForum, s, self.onForum) @@ -2512,6 +2518,7 @@ This deck already exists on your computer. Overwrite the local copy?"""), def disableCardMenuItems(self): self.maybeEnableUndo() self.mainWin.actionEditCurrent.setEnabled(False) + self.mainWin.actionEditLayout.setEnabled(False) self.mainWin.actionMarkCard.setEnabled(False) self.mainWin.actionSuspendCard.setEnabled(False) self.mainWin.actionDelete.setEnabled(False) @@ -2524,6 +2531,7 @@ This deck already exists on your computer. Overwrite the local copy?"""), snd = (hasSound(self.currentCard.question) or (hasSound(self.currentCard.answer) and self.state != "getQuestion")) + self.mainWin.actionEditLayout.setEnabled(True) self.mainWin.actionRepeatAudio.setEnabled(snd) self.mainWin.actionMarkCard.setEnabled(True) self.mainWin.actionSuspendCard.setEnabled(True) diff --git a/designer/main.ui b/designer/main.ui index cca4705f2..d6e1542f4 100644 --- a/designer/main.ui +++ b/designer/main.ui @@ -3029,6 +3029,7 @@ + @@ -3580,7 +3581,7 @@ :/icons/edit-rename.png:/icons/edit-rename.png - Edit &Current... + &Current Fact... @@ -3743,6 +3744,18 @@ Save media files using original file names + + + + :/icons/layout.png:/icons/layout.png + + + Card Layout... + + + Ctrl+L + + easeButton3 diff --git a/designer/modelproperties.ui b/designer/modelproperties.ui index 65dfc41d6..b3feb9a6b 100644 --- a/designer/modelproperties.ui +++ b/designer/modelproperties.ui @@ -151,6 +151,10 @@ Card &Layout + + + :/icons/layout.png:/icons/layout.png + @@ -185,7 +189,9 @@ cardLayout buttonBox - + + + buttonBox diff --git a/icons.qrc b/icons.qrc index add069489..230974765 100644 --- a/icons.qrc +++ b/icons.qrc @@ -1,5 +1,6 @@ + icons/layout.png icons/generate_07.png icons/view-sort-descending.png icons/emblem-important.png diff --git a/icons/layout.png b/icons/layout.png new file mode 100644 index 0000000000000000000000000000000000000000..2ad40bd848eb5ec49b4860d3ab568b74c34ed5f0 GIT binary patch literal 1796 zcmV+f2mAPmP)Px#24YJ`L;wH)0002_L%V+f000SaNLh0L00VXa00VXbebs`@00007bV*G`2ign= z2s9w60m9Y*00x9fL_t(o!^M|NY?Rj($A9PE`DVsr;~6kuoAQuDz`T@1L8NI!NsuBE ziA}qzLKoe4TScn6?6OK#RYELUsjGGoq|&menzW6oP#Q!`n^qJB!prvf31jTR4`#ma z-gCMb11?}=)CEU6iz{8-|Ns8ax%ZqSX2$b0$8)ylP9V2*AtHI8{r@Cpi>^Qlq-GYE z+bs8UKtw#S^+zW^yPES(lAI@(b0i|-bDqQt&N;jjyvTzC)Id#%YTQdRt<~przR?VG z3ypN)USm8@n%>wq6kh};B$9p zs83C?VQU{^-mfXNxyu7*bH2S?Z13&s)O>zdThy-u2Y~vDAppEaKp+Og8Q={Em?+Dxs+?XhuUG-jr1RJymK<`}tlnGlr9hE0@;9pqh(#Cg0=@~vwk#onC@*m*t~n20a!HDAZ;vg?O&f$>D^5G+HTs)8wjeT zL5WcwHS!(nNQ085N~$flq`;>B zR~fx=g)}Oe8bKjMZMnG|Pz1b)6{P4w#7k}lP`;Lg5H8XpX0;ECl zNr4c8Wg!|aN2W&g>LqfePF%i3VNDmswLRoJDv%UuHk&jW4YCl)LbNPI%c9+1bL7a8 zz5Dj<`_0j#M|-bcy?P2LJW+u(C}I&wic~LsA(HcGNV#|Kp0!mrP^zp)L_~oYB5F{- zHOln(5Iy~`S~H78HB?)_V~ByC+ydW!|NWm&PEM8w2M6b?)#^`{&4DaN=I3U)dj1nB zZ|gS`ZyR^KV#8lvkokpKf+=YXmS(}`=Vq;X`3obLx9(jBESfyHafnJY%h)P4IlM*O z$jC@}aBy($#EBC>ymIBrFM;NhUx6vU*v_Vx4%+06FU2Q`1#@iJx!)G1Z!z?r0TB_B zLc8TVDy-eokBM)^-hoCXVuUoXJwGk)9qgBpkr75mNA>*q^CyRfhJFpyZLtVFMj#8( zyc3apfsRctnuR7=Y!$Plvx{||UAD9krDkA@vPW9d$HbI(hcp7(Wl-6%Td}7`u zNWP6+sYFs*L$r+kVqK0M-2DLj6afw77O7ty;8-mh68>01LG-DVNq*efWx`^LJU8nvn9A9X5UAl9)z(p^bb; z#a^nY9D8HGdlbC1z8mp=nL@l0fki9#^|zi%dxv#yeX(^IP^hdmfY{79*cIg4-`MM_ z)oM%jKbZbHjoBHbC(zWwtyLV?&8q>D`Xw1}T>*__k=dHeV@~zij zmn_S;cI_I!`|CN=U9Fg}2K=c6Dt&tlpuA;=CGBgLB%HA;xhuyGzan#Ub6mJ^f!}{} z)^yL|X99mJ0iU#zXDK)U^$Fg2tKVI}ew}Ky%BjDcHQW2_;7=mZ`XprevA{yc+~v>R z2j_mv+wZ)~$DjS0bh}1#|=VxYS{s~Mi2e4>! zz?moggtBxvUBzV7RW6tR(B9sDacpetXFwHLcnUa+ZP>h-rOPU?8WWMXfga#*!1$96 md{%o_0)<6&R-E^q#r_LG=