Subversion Repositories Scribus

Rev

Go to most recent revision | Show changed files | Details | Compare with Previous | Blame | RSS feed

Filtering Options

Rev Age Author Path Log message Diff
3673 6182d 19h cbradney /branches/Version13x/Scribus/scribus/scribusdoc.cpp -More work on item conversion code. Changed some functions like MoveItemI in View to take an item pointer instead of Doc Item Number along the way.
-Most conversions should be working.
-To Path text kind of works, From path text - untested, bezier2poly from editing frames - not done yet.
 
3670 6183d 18h cbradney /branches/Version13x/Scribus/scribus/scribusdoc.cpp -Remove page.h from scribusview.h as its not needed there.
-Implement new conversion to image frames, and undo functionality, with new functions in ScribusDoc and Page.
-Go to sleep at stupid time, hope it compiles everywhere else too :)
 
3664 6184d 06h cbradney /branches/Version13x/Scribus/scribus/scribusdoc.cpp Add in some convenience functions from the doc to get the x/y offset for the pages. Could also handle canvas offset in the future.  
3657 6184d 21h cbradney /branches/Version13x/Scribus/scribus/scribusdoc.cpp Move some more functions around, specifically ones like the View's OnPage where it doesnt use a View function, but only a Doc function. For some of these changes, the decision to use the view or doc's version needs to be made by the programmer, though this will be cleaner in the future. With these changes, the 1.3.x loader functions dont need to access the view at all anymore.  
3656 6185d 21h cbradney /branches/Version13x/Scribus/scribus/scribusdoc.cpp Move the canvas size calculation out of the main 1.3.x file loader code loop and to the recently implemented postload function. This should decrease the time to read thru the loading items and cause only one canvas size operation.  
3652 6186d 20h cbradney /branches/Version13x/Scribus/scribus/scribusdoc.cpp Reset currentPage after copy page to master page, tho I dont think we need to change current page in this case anyway. To check. Fixes sig11. Return and Q_ASSERT if copyPageToMasterPage is called from masterpage mode. Remove 2 qdebugs.  
3650 6186d 21h cbradney /branches/Version13x/Scribus/scribus/scribusdoc.cpp Make a major attempt at removing ScribusView access within the 1.3 FileLoader code. More to be done here, certainly achievable.
Moved ScribusView->AdjustPictScale to PageItem (might move to a more specific frame type later). Moved ScribusView loadPict and LoadPict to the Doc. Fixed an oops in code move in copyPageToMasterPage and fix a sig11 in the same function.
 
3648 6187d 23h cbradney /branches/Version13x/Scribus/scribus/scribusdoc.cpp Move the automatic text frames to protected. WHY is this set on and off before a slotNewPage()? This shouldnt be needed!
Stop emitting to or calling ScApp's slotNewPage when a doc is loaded! When the doc is loaded, we have no gui for it, and we should not rely on one. For <=1.2.x docs, we still call view->addPage as theres code there that makes these docs end up in the correct place. This needs to move into the 1.2 loader and then we can stop calling the view! ARGH!
 
3628 6191d 20h cbradney /branches/Version13x/Scribus/scribus/scribusdoc.cpp Move a simple FrameItems update loop into ScribusDoc  
3617 6193d 00h cbradney /branches/Version13x/Scribus/scribus/scribusdoc.cpp The Greak Breakage.. start using the split up pageitem classes. Known issues: PathText and item conversion, and any pageitem=pageitem stuff hidden away that hasnt found build errors.  
3572 6195d 21h avox /branches/Version13x/Scribus/scribus/scribusdoc.cpp make a defensive check in AddFont  
3554 6196d 11h fschmid /branches/Version13x/Scribus/scribus/scribusdoc.cpp Partly solved bug #2646  
3544 6197d 09h avox /branches/Version13x/Scribus/scribus/scribusdoc.cpp Work on Foi API: replace SCName, Family, Effect with accessors, Drop QFont attribute  
3500 6200d 09h avox /branches/Version13x/Scribus/scribus/scribusdoc.cpp Make Foi::Datei private, use fontFilePath() instead  
3438 6205d 00h cbradney /branches/Version13x/Scribus/scribus/scribusdoc.cpp Add in #ifdefs around some CMS variables used.  
3361 6213d 22h cbradney /branches/Version13x/Scribus/scribus/scribusdoc.cpp Start using the doc's page to master page conversion code. Existing Sig11 on page conversion in original code has disappeared ??.  
3356 6213d 23h fschmid /branches/Version13x/Scribus/scribus/scribusdoc.cpp Fixed issues with the colour settings when switching CMS on or off  
3324 6216d 06h fschmid /branches/Version13x/Scribus/scribus/scribusdoc.cpp Fixed crash on "Convert to Master Page" and removed reference to 2 no longer existing icons.  
3319 6216d 12h fschmid /branches/Version13x/Scribus/scribus/scribusdoc.cpp Applied the fixes for CopyPage to the copyToMasterPage function too.  
3292 6219d 23h cbradney /branches/Version13x/Scribus/scribus/scribusdoc.cpp Eliminate ScribusView::Paint<ObjectType> and use the ScribusDoc ones directly. Old code remains, please leave there for now.  

Show All